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 tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap1
/
Makefile
diff --git
a/arch/arm/mach-omap1/Makefile
b/arch/arm/mach-omap1/Makefile
index a7e9c6d19fb588a07f5ff1f7ed0636c8975043aa..c757a52d080136b91cd3fa50890d839eb5e00e80 100644
(file)
--- a/
arch/arm/mach-omap1/Makefile
+++ b/
arch/arm/mach-omap1/Makefile
@@
-25,7
+25,7
@@
obj-y += $(i2c-omap-m) $(i2c-omap-y)
led-y := leds.o
-usb-fs-$(CONFIG_USB
)
:= usb.o
+usb-fs-$(CONFIG_USB
_SUPPORT)
:= usb.o
obj-y += $(usb-fs-m) $(usb-fs-y)
# Specific board support