summaryrefslogtreecommitdiffstats
path: root/drivers/ide/cris/Makefile
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-07-30 14:37:43 +1000
committerDave Airlie <airlied@linux.ie>2005-07-30 14:37:43 +1000
commitbdf242eeb0f69567fe43eba93889d80ecacbfe94 (patch)
treedc402eeeb75fd51e92b4f4a63712c6e64ac4c2fb /drivers/ide/cris/Makefile
parent836cf0465c422ee6d654060edd7c620d9cf0c09c (diff)
parentb0825488a642cadcf39709961dde61440cb0731c (diff)
downloadkernel-crypto-bdf242eeb0f69567fe43eba93889d80ecacbfe94.tar.gz
kernel-crypto-bdf242eeb0f69567fe43eba93889d80ecacbfe94.tar.xz
kernel-crypto-bdf242eeb0f69567fe43eba93889d80ecacbfe94.zip
Merge ../linux-2.6/
Diffstat (limited to 'drivers/ide/cris/Makefile')
-rw-r--r--drivers/ide/cris/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/cris/Makefile b/drivers/ide/cris/Makefile
index fdc294325d0..6176e8d6b2e 100644
--- a/drivers/ide/cris/Makefile
+++ b/drivers/ide/cris/Makefile
@@ -1,3 +1,3 @@
EXTRA_CFLAGS += -Idrivers/ide
-obj-$(CONFIG_ETRAX_ARCH_V10) += ide-v10.o
+obj-y += ide-cris.o