git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
drivers
/
ide
/
cris
/
Makefile
diff --git
a/drivers/ide/cris/Makefile
b/drivers/ide/cris/Makefile
index
6176e8d
..
20b9596
100644
(file)
--- a/
drivers/ide/cris/Makefile
+++ b/
drivers/ide/cris/Makefile
@@
-1,3
+1,3
@@
EXTRA_CFLAGS += -Idrivers/ide
EXTRA_CFLAGS += -Idrivers/ide
-obj-
y
+= ide-cris.o
+obj-
$(CONFIG_IDE_ETRAX)
+= ide-cris.o