o fix warnings in bitops.h

o enable RTC driver for DECstations by default
o let KMINs work again

4 files changed, 10 insertions, 22 deletions

diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c
index 798f21832..a71ad234a 100644
--- a/arch/mips/dec/time.c
+++ b/arch/mips/dec/time.c
@@ -551,7 +551,7 @@ void __init time_init(void)
 		write_32bit_cp0_register(CP0_COUNT, 0);
 		do_gettimeoffset = do_fast_gettimeoffset;
 		irq0.handler = r4k_timer_interrupt;
-	} else if (IOASIC) {
+	} else if (mips_machtype == MACH_DS5000_2X0) {
 		ioasic_write(FCTR, 0);
 		do_gettimeoffset = do_ioasic_gettimeoffset;
 		irq0.handler = ioasic_timer_interrupt;
diff --git a/arch/mips/defconfig-decstation b/arch/mips/defconfig-decstation
index 639fdf0a0..b79e4bcb3 100644
--- a/arch/mips/defconfig-decstation
+++ b/arch/mips/defconfig-decstation
@@ -1,5 +1,5 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 
 #
@@ -115,10 +115,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_IPV6 is not set
 # CONFIG_KHTTPD is not set
 # CONFIG_ATM is not set
-
-#
-#  
-#
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 # CONFIG_DECNET is not set
@@ -140,19 +136,11 @@ CONFIG_IP_PNP_BOOTP=y
 # SCSI support
 #
 CONFIG_SCSI=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
 CONFIG_BLK_DEV_SD=y
 CONFIG_SD_EXTRA_DEVS=40
 # CONFIG_CHR_DEV_ST is not set
 # CONFIG_BLK_DEV_SR is not set
 # CONFIG_CHR_DEV_SG is not set
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
 # CONFIG_SCSI_DEBUG_QUEUES is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_SCSI_CONSTANTS=y
@@ -215,7 +203,7 @@ CONFIG_SERIAL=y
 CONFIG_ZS=y
 CONFIG_SERIAL_CONSOLE=y
 # CONFIG_UNIX98_PTYS is not set
-# CONFIG_RTC is not set
+CONFIG_RTC=y
 
 #
 # File systems
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))