diff options
| author | Harald Koerfgen <hkoerfg@web.de> | 2000-10-03 09:37:04 +0000 |
|---|---|---|
| committer | Harald Koerfgen <hkoerfg@web.de> | 2000-10-03 09:37:04 +0000 |
| commit | 8d95527e3887e226935ab7cb1a61d570b6468373 (patch) | |
| tree | ca98770e0fa6275194ece8d20be42db7bbc70bf2 /include | |
| parent | d5273ee448827545d9a042b0b8d4e61261e2203f (diff) | |
o fix warnings in bitops.h
o enable RTC driver for DECstations by default
o let KMINs work again
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/bitops.h | 12 | ||||
| -rw-r--r-- | include/asm-mips/dec/kn02xa.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h index b18158bfc..9f209e847 100644 --- a/include/asm-mips/bitops.h +++ b/include/asm-mips/bitops.h @@ -174,7 +174,7 @@ test_and_change_bit(int nr, volatile void *addr) extern __inline__ void set_bit(int nr, volatile void * addr) { int mask; - int *a = addr; + volatile int *a = addr; __bi_flags; a += nr >> 5; @@ -187,7 +187,7 @@ extern __inline__ void set_bit(int nr, volatile void * addr) extern __inline__ void clear_bit(int nr, volatile void * addr) { int mask; - int *a = addr; + volatile int *a = addr; __bi_flags; a += nr >> 5; @@ -200,7 +200,7 @@ extern __inline__ void clear_bit(int nr, volatile void * addr) extern __inline__ void change_bit(int nr, volatile void * addr) { int mask; - int *a = addr; + volatile int *a = addr; __bi_flags; a += nr >> 5; @@ -213,7 +213,7 @@ extern __inline__ void change_bit(int nr, volatile void * addr) extern __inline__ int test_and_set_bit(int nr, volatile void * addr) { int mask, retval; - int *a = addr; + volatile int *a = addr; __bi_flags; a += nr >> 5; @@ -229,7 +229,7 @@ extern __inline__ int test_and_set_bit(int nr, volatile void * addr) extern __inline__ int test_and_clear_bit(int nr, volatile void * addr) { int mask, retval; - int *a = addr; + volatile int *a = addr; __bi_flags; a += nr >> 5; @@ -245,7 +245,7 @@ extern __inline__ int test_and_clear_bit(int nr, volatile void * addr) extern __inline__ int test_and_change_bit(int nr, volatile void * addr) { int mask, retval; - int *a = addr; + volatile int *a = addr; __bi_flags; a += nr >> 5; diff --git a/include/asm-mips/dec/kn02xa.h b/include/asm-mips/dec/kn02xa.h index 4f913e4d7..5425fc0c1 100644 --- a/include/asm-mips/dec/kn02xa.h +++ b/include/asm-mips/dec/kn02xa.h @@ -24,7 +24,7 @@ * FIXME: these addresses are incomplete and need tidying up! */ #define KN02XA_IOASIC_BASE KSEG1ADDR(0x1c040000) /* I/O ASIC */ -#define KN02XA_RTC_BASE KSEG1ADDR(0x1e000000) /* RTC */ +#define KN02XA_RTC_BASE KSEG1ADDR(0x1c200000) /* RTC */ #define KN02XA_IOASIC_REG(r) (KN02XA_IOASIC_BASE+(r)) |