Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville...

[karo-tx-linux.git] / include / asm-m68knommu / system.h

diff --git a/include/asm-m68knommu/system.h b/include/asm-m68knommu/system.h
index 5e5ed18bb78f54185da3d69ecfc0b1e9fd2373f7..1bd1142685e18f5dd916c0dcf838fe1e3c2435df 100644 (file)
--- a/include/asm-m68knommu/system.h
+++ b/include/asm-m68knommu/system.h
@@ -253,8 +253,7 @@ cmpxchg(volatile int *p, int old, int new)
         ");                            \
 })
 #elif defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \
-      defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3) || \
-      defined(CONFIG_CLEOPATRA)
+      defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA)
 #define HARD_RESET_NOW() ({            \
         asm("                          \
        movew #0x2700, %sr;             \
@@ -296,7 +295,7 @@ cmpxchg(volatile int *p, int old, int new)
 ({                                             \
        unsigned char volatile *reset;          \
        asm("move.w     #0x2700, %sr");         \
-       reset = ((volatile unsigned short *)(MCF_IPSBAR + 0x110000));   \
+       reset = ((volatile unsigned char *)(MCF_IPSBAR + 0x110000));    \
        while(1)                                \
        *reset |= (0x01 << 7);\
 })
@@ -318,7 +317,7 @@ cmpxchg(volatile int *p, int old, int new)
 ({                                     \
        unsigned char volatile *reset;  \
        asm("move.w     #0x2700, %sr"); \
-       reset = ((volatile unsigned short *)(MCF_IPSBAR + 0xA0000));    \
+       reset = ((volatile unsigned char *)(MCF_IPSBAR + 0xA0000));     \
        while(1)                        \
                *reset |= 0x80;         \
 })