diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-08-08 16:30:29 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-08-08 16:30:29 +0400 |
commit | 0a2d31b62dba9b5b92a38c67c9cc42630513662a (patch) | |
tree | f755d74ec85248de645e10c45ed1a2ed467530f6 /arch/microblaze/pci/Makefile | |
parent | 8039290a91c5dc4414093c086987a5d7738fe2fd (diff) | |
parent | df944f66784e6d4f2f50739263a4947885d8b6ae (diff) | |
download | linux-0a2d31b62dba9b5b92a38c67c9cc42630513662a.tar.xz |
Merge branch 'fix/kconfig' into for-linus
Diffstat (limited to 'arch/microblaze/pci/Makefile')
-rw-r--r-- | arch/microblaze/pci/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/pci/Makefile b/arch/microblaze/pci/Makefile index 9889cc2e1294..d1114fbd4780 100644 --- a/arch/microblaze/pci/Makefile +++ b/arch/microblaze/pci/Makefile @@ -2,5 +2,5 @@ # Makefile # -obj-$(CONFIG_PCI) += pci_32.o pci-common.o indirect_pci.o iomap.o +obj-$(CONFIG_PCI) += pci-common.o indirect_pci.o iomap.o obj-$(CONFIG_PCI_XILINX) += xilinx_pci.o |