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 branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
arch
/
arm
/
plat-pxa
/
Makefile
diff --git
a/arch/arm/plat-pxa/Makefile
b/arch/arm/plat-pxa/Makefile
index
4aacdd1
..
3aca5ba
100644
(file)
--- a/
arch/arm/plat-pxa/Makefile
+++ b/
arch/arm/plat-pxa/Makefile
@@
-6,6
+6,7
@@
obj-y := dma.o
obj-$(CONFIG_GENERIC_GPIO) += gpio.o
obj-$(CONFIG_PXA3xx) += mfp.o
+obj-$(CONFIG_PXA95x) += mfp.o
obj-$(CONFIG_ARCH_MMP) += mfp.o
obj-$(CONFIG_HAVE_PWM) += pwm.o