Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/pci/pci.h between commit 4e15c46bdc4d ("PCI: Add pci_device_type
to pdev's device struct") from the pci tree and commit b40b97ae736c
("PCI: Remove CONFIG_HOTPLUG ifdefs") from the driver-core tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au diff --cc drivers/pci/pci.h index 11a713b,e253881..0000000 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@@ -159,12 -158,7 +158,8 @@@ static inline int pci_no_d1d2(struct pc } extern struct device_attribute pci_dev_attrs[]; extern struct device_attribute pcibus_dev_attrs[]; +extern struct device_type pci_dev_type; - #ifdef CONFIG_HOTPLUG extern struct bus_attribute pci_bus_attrs[]; - #else - #define pci_bus_attrs NULL - #endif /**
pgpB0Tlt98N5U.pgp
Description: PGP signature
