Merge branch 'pci/misc' into next

Browse source

* pci/misc:
  PCI: cpqphp: Cleanup and remove unreachable paths
  PCI: Drop "__" prefix on __pci_enable_device_flags()
  PCI: Use "unsigned long" for __pci_enable_device_flags to match ioport.h
  mn10300/PCI: Remove unused pci_root_bus
  frv/PCI: Remove unused pci_root_bus
  x86/PCI: Remove unused pci_root_bus

...

This commit is contained in:

Bjorn Helgaas 2013-01-09 11:37:01 -07:00

parent d1c3ed669a 3ecd9d01f7

commit e84d0dedd3

10 changed files with 28 additions and 54 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/frv/mb93090-mb00/pci-frv.h

View file

4

arch/frv/mb93090-mb00/pci-vdk.c

View file

1

arch/mn10300/unit-asb2305/pci-asb2305.h

View file

4

arch/mn10300/unit-asb2305/pci.c

View file

1

arch/x86/include/asm/pci_x86.h

View file

1

arch/x86/pci/common.c

View file

2

arch/x86/pci/legacy.c

View file

2

arch/x86/pci/numaq_32.c

View file

57

drivers/pci/hotplug/cpqphp_ctrl.c

View file

9

drivers/pci/pci.c

View file