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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop13xx
/
Makefile
diff --git
a/arch/arm/mach-iop13xx/Makefile
b/arch/arm/mach-iop13xx/Makefile
index
da1609d
..
cad015f
100644
(file)
--- a/
arch/arm/mach-iop13xx/Makefile
+++ b/
arch/arm/mach-iop13xx/Makefile
@@
-10,3
+10,4
@@
obj-$(CONFIG_ARCH_IOP13XX) += io.o
obj-$(CONFIG_ARCH_IOP13XX) += tpmi.o
obj-$(CONFIG_MACH_IQ81340SC) += iq81340sc.o
obj-$(CONFIG_MACH_IQ81340MC) += iq81340mc.o
+obj-$(CONFIG_PCI_MSI) += msi.o