Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / include / asm-sh / ide.h

diff --git a/include/asm-sh/ide.h b/include/asm-sh/ide.h
index f42cf3977a5748890a1721f4b5ce64a45658e9d2..58e0bdd52be45827aef0ffbdccd3098527d902c5 100644 (file)
--- a/include/asm-sh/ide.h
+++ b/include/asm-sh/ide.h
@@ -14,14 +14,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
-
-#ifndef MAX_HWIFS
-#define MAX_HWIFS      CONFIG_IDE_MAX_HWIFS
-#endif
-
-#define ide_default_io_ctl(base)       (0)
-
 #include <asm-generic/ide_iops.h>
 
 #endif /* __KERNEL__ */