git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp4xx
/
Makefile
diff --git
a/arch/arm/mach-ixp4xx/Makefile
b/arch/arm/mach-ixp4xx/Makefile
index
ab39693
..
d807fc3
100644
(file)
--- a/
arch/arm/mach-ixp4xx/Makefile
+++ b/
arch/arm/mach-ixp4xx/Makefile
@@
-16,6
+16,7
@@
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
+obj-pci-$(CONFIG_MACH_ARCOM_VULCAN) += vulcan-pci.o
obj-y += common.o