git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge /spare/repo/linux-2.6/
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
Makefile
diff --git
a/arch/arm/mach-pxa/Makefile
b/arch/arm/mach-pxa/Makefile
index efc2f657184edaf0245863b8782510985f28eb00..33dae99ec2d843290105013226519a47e3a50daf 100644
(file)
--- a/
arch/arm/mach-pxa/Makefile
+++ b/
arch/arm/mach-pxa/Makefile
@@
-11,7
+11,7
@@
obj-$(CONFIG_PXA27x) += pxa27x.o
obj-$(CONFIG_ARCH_LUBBOCK) += lubbock.o
obj-$(CONFIG_MACH_MAINSTONE) += mainstone.o
obj-$(CONFIG_ARCH_PXA_IDP) += idp.o
obj-$(CONFIG_ARCH_LUBBOCK) += lubbock.o
obj-$(CONFIG_MACH_MAINSTONE) += mainstone.o
obj-$(CONFIG_ARCH_PXA_IDP) += idp.o
-obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o corgi_ssp.o ssp.o
+obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o corgi_ssp.o
corgi_lcd.o
ssp.o
obj-$(CONFIG_MACH_POODLE) += poodle.o
# Support for blinky lights
obj-$(CONFIG_MACH_POODLE) += poodle.o
# Support for blinky lights