Changeset da68871a in mainline for uspace/drv/bus/pci/pciintel/pci.h

Timestamp:

2012-08-08T08:46:22Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

30c0826

Parents:

bc216a0 (diff), 1d01cca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged changes from mainline.

File:

• uspace/drv/bus/pci/pciintel/pci.h (modified) (1 diff)

uspace/drv/bus/pci/pciintel/pci.h

@@ -46 +46 @@
         ddf_dev_t *dnode;
         uint32_t conf_io_addr;
+        uint32_t conf_io_data;
         void *conf_data_port;
         void *conf_addr_port;