4 files changed, 3 insertions, 42 deletions

diff --git a/include/asm-sh/cpu-sh3/cache.h b/include/asm-sh/cpu-sh3/cache.h
index 56bd838b7db4..bee2d81c56bf 100644
--- a/include/asm-sh/cpu-sh3/cache.h
+++ b/include/asm-sh/cpu-sh3/cache.h
@@ -35,7 +35,7 @@
     defined(CONFIG_CPU_SUBTYPE_SH7710) || \
     defined(CONFIG_CPU_SUBTYPE_SH7720) || \
     defined(CONFIG_CPU_SUBTYPE_SH7721)
-#define CCR3    0xa40000b4
+#define CCR3_REG        0xa40000b4
 #define CCR_CACHE_16KB  0x00010000
 #define CCR_CACHE_32KB  0x00020000
 #endif
diff --git a/include/asm-sh/delay.h b/include/asm-sh/delay.h
index d5d464041003..4b16bf9b56bd 100644
--- a/include/asm-sh/delay.h
+++ b/include/asm-sh/delay.h
@@ -15,7 +15,6 @@ extern void __ndelay(unsigned long nsecs);
 extern void __const_udelay(unsigned long xloops);
 extern void __delay(unsigned long loops);
 
-#ifdef CONFIG_SUPERH32
 #define udelay(n) (__builtin_constant_p(n) ? \
         ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c6ul)) : \
         __udelay(n))
@@ -23,9 +22,5 @@ extern void __delay(unsigned long loops);
 #define ndelay(n) (__builtin_constant_p(n) ? \
         ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \
         __ndelay(n))
-#else
-extern void udelay(unsigned long usecs);
-extern void ndelay(unsigned long nsecs);
-#endif
 
 #endif /* __ASM_SH_DELAY_H */
diff --git a/include/asm-sh/entry-macros.S b/include/asm-sh/entry-macros.S
index 500030eae7aa..2dab0b8d9454 100644
--- a/include/asm-sh/entry-macros.S
+++ b/include/asm-sh/entry-macros.S
@@ -12,7 +12,7 @@
         not     r11, r11
         stc     sr, r10
         and     r11, r10
-#ifdef CONFIG_HAS_SR_RB
+#ifdef CONFIG_CPU_HAS_SR_RB
         stc     k_g_imask, r11
         or      r11, r10
 #endif
@@ -20,7 +20,7 @@
         .endm
 
         .macro  get_current_thread_info, ti, tmp
-#ifdef CONFIG_HAS_SR_RB
+#ifdef CONFIG_CPU_HAS_SR_RB
         stc     r7_bank, \ti
 #else
         mov     #((THREAD_SIZE - 1) >> 10) ^ 0xff, \tmp
diff --git a/include/asm-sh/sci.h b/include/asm-sh/sci.h
deleted file mode 100644
index 52e73660c129..000000000000
--- a/include/asm-sh/sci.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __ASM_SH_SCI_H
-#define __ASM_SH_SCI_H
-
-#include <linux/serial_core.h>
-
-/*
- * Generic header for SuperH SCI(F)
- *
- * Do not place SH-specific parts in here, sh64 and h8300 depend on this too.
- */
-
-/* Offsets into the sci_port->irqs array */
-enum {
-        SCIx_ERI_IRQ,
-        SCIx_RXI_IRQ,
-        SCIx_TXI_IRQ,
-        SCIx_BRI_IRQ,
-        SCIx_NR_IRQS,
-};
-
-/*
- * Platform device specific platform_data struct
- */
-struct plat_sci_port {
-        void __iomem    *membase;               /* io cookie */
-        unsigned long   mapbase;                /* resource base */
-        unsigned int    irqs[SCIx_NR_IRQS];     /* ERI, RXI, TXI, BRI */
-        unsigned int    type;                   /* SCI / SCIF / IRDA */
-        upf_t           flags;                  /* UPF_* flags */
-};
-
-int early_sci_setup(struct uart_port *port);
-
-#endif /* __ASM_SH_SCI_H */