diff options
author | 2005-09-09 08:19:10 -0700 | |
---|---|---|
committer | 2005-09-09 08:19:10 -0700 | |
commit | ddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch) | |
tree | aaf0392346a18b3e232ddeb5db3c4e917f7ca686 /drivers/pci/hotplug/Makefile | |
parent | Merge branch 'master' of /usr/src/linux-2.6 (diff) | |
parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
download | linux-dev-ddcc95963449d028b16d9b9fe50f6e91ce7d9e81.tar.xz linux-dev-ddcc95963449d028b16d9b9fe50f6e91ce7d9e81.zip |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/pci/hotplug/Makefile')
-rw-r--r-- | drivers/pci/hotplug/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile index 246586a3d91a..3c71e3077ff1 100644 --- a/drivers/pci/hotplug/Makefile +++ b/drivers/pci/hotplug/Makefile @@ -41,8 +41,7 @@ acpiphp-objs := acpiphp_core.o \ rpaphp-objs := rpaphp_core.o \ rpaphp_pci.o \ - rpaphp_slot.o \ - rpaphp_vio.o + rpaphp_slot.o rpadlpar_io-objs := rpadlpar_core.o \ rpadlpar_sysfs.o |