aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/Makefile
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-05-19 10:12:41 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-05-19 10:12:41 -0700
commit8d0bc2b456103a34c11e01305cd1aed1cde579e5 (patch)
tree5e1e6ad55cc9e2b5c5617f6f320114b8cff9e3f3 /drivers/usb/musb/Makefile
parentInput: add keypad driver for keys interfaced to TCA6416 (diff)
parentLinus 2.6.34 (diff)
downloadlinux-dev-8d0bc2b456103a34c11e01305cd1aed1cde579e5.tar.xz
linux-dev-8d0bc2b456103a34c11e01305cd1aed1cde579e5.zip
Merge commit 'v2.6.34' into next
Diffstat (limited to 'drivers/usb/musb/Makefile')
-rw-r--r--drivers/usb/musb/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index 85710ccc1887..3a485dabebbb 100644
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -6,7 +6,7 @@ musb_hdrc-objs := musb_core.o
obj-$(CONFIG_USB_MUSB_HDRC) += musb_hdrc.o
-ifeq ($(CONFIG_ARCH_DAVINCI),y)
+ifeq ($(CONFIG_ARCH_DAVINCI_DMx),y)
musb_hdrc-objs += davinci.o
endif