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 'for-2.6.30' into for-2.6.31
[linux-2.6]
/
drivers
/
ide
/
Makefile
diff --git
a/drivers/ide/Makefile
b/drivers/ide/Makefile
index
9b4bbe1
..
81df925
100644
(file)
--- a/
drivers/ide/Makefile
+++ b/
drivers/ide/Makefile
@@
-21,8
+21,6
@@
ide-core-$(CONFIG_IDE_LEGACY) += ide-legacy.o
obj-$(CONFIG_IDE) += ide-core.o
-obj-$(CONFIG_IDE_ARM) += ide_arm.o
-
obj-$(CONFIG_BLK_DEV_ALI14XX) += ali14xx.o
obj-$(CONFIG_BLK_DEV_UMC8672) += umc8672.o
obj-$(CONFIG_BLK_DEV_DTC2278) += dtc2278.o