projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6]
/
arch
/
arm
/
mach-sa1100
/
Makefile
diff --git
a/arch/arm/mach-sa1100/Makefile
b/arch/arm/mach-sa1100/Makefile
index
8e02446
..
8a5546e
100644
(file)
--- a/
arch/arm/mach-sa1100/Makefile
+++ b/
arch/arm/mach-sa1100/Makefile
@@
-46,9
+46,6
@@
led-$(CONFIG_SA1100_SIMPAD) += leds-simpad.o
# LEDs support
obj-$(CONFIG_LEDS) += $(led-y)
-# SA1110 USB client support
-#obj-$(CONFIG_SA1100_USB) += usb/
-
# Miscelaneous functions
obj-$(CONFIG_PM) += pm.o sleep.o
obj-$(CONFIG_SA1100_SSP) += ssp.o