---

yaml --- r: 40180 b: refs/heads/master c: 4a58eac h: refs/heads/master v: v3
git-mirror · Oct 19, 2006 · f6d78c4 · f6d78c4
1 parent 87661db
commit f6d78c4
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 73 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b0022305f80cf249de69e746f6f5ccf7ffc5b7c
+refs/heads/master: 4a58eaca7ca68abea37d6d2a4ea7deb394906183
diff --git a/trunk/include/asm-sh/hp6xx/ide.h b/trunk/include/asm-sh/hp6xx/ide.h
diff --git a/trunk/include/asm-sh/hs7751rvoip/ide.h b/trunk/include/asm-sh/hs7751rvoip/ide.h
diff --git a/trunk/include/asm-sh/irq.h b/trunk/include/asm-sh/irq.h
@@ -14,16 +14,6 @@
 #include <asm/machvec.h>
 #include <asm/ptrace.h>		/* for pt_regs */
 
-#if defined(CONFIG_SH_HP6XX) || \
-    defined(CONFIG_SH_RTS7751R2D) || \
-    defined(CONFIG_SH_HS7751RVOIP) || \
-    defined(CONFIG_SH_HS7751RVOIP) || \
-    defined(CONFIG_SH_SH03) || \
-    defined(CONFIG_SH_R7780RP) || \
-    defined(CONFIG_SH_LANDISK)
-#include <asm/mach/ide.h>
-#endif
-
 #ifndef CONFIG_CPU_SUBTYPE_SH7780
 
 #define INTC_DMAC0_MSK	0
@@ -38,15 +28,6 @@
 #define INTC_IPRD	0xffd00010UL
 #endif
 
-#ifdef CONFIG_IDE
-# ifndef IRQ_CFCARD
-#  define IRQ_CFCARD	14
-# endif
-# ifndef IRQ_PCMCIA
-#  define IRQ_PCMCIA	15
-# endif
-#endif
-
 #define TIMER_IRQ	16
 #define TIMER_IPR_ADDR	INTC_IPRA
 #define TIMER_IPR_POS	 3

diff --git a/trunk/include/asm-sh/landisk/ide.h b/trunk/include/asm-sh/landisk/ide.h
diff --git a/trunk/include/asm-sh/r7780rp/ide.h b/trunk/include/asm-sh/r7780rp/ide.h
diff --git a/trunk/include/asm-sh/rts7751r2d/ide.h b/trunk/include/asm-sh/rts7751r2d/ide.h
diff --git a/trunk/include/asm-sh/sh03/ide.h b/trunk/include/asm-sh/sh03/ide.h