Merge with 2.3.48.

8 files changed, 11 insertions, 9 deletions

diff --git a/include/asm-arm/arch-arc/io.h b/include/asm-arm/arch-arc/io.h
index c7d6b9e2b..e42c80b02 100644
--- a/include/asm-arm/arch-arc/io.h
+++ b/include/asm-arm/arch-arc/io.h
@@ -91,7 +91,7 @@ extern __inline__ unsigned int __ioaddr (unsigned int port)			\
 
 DECLARE_IO(char,b,"b")
 DECLARE_IO(short,w,"")
-DECLARE_IO(long,l,"")
+DECLARE_IO(int,l,"")
 
 #undef DECLARE_IO
 #undef DECLARE_DYN_IN
diff --git a/include/asm-arm/arch-cl7500/io.h b/include/asm-arm/arch-cl7500/io.h
index bdbbefce3..37f44316c 100644
--- a/include/asm-arm/arch-cl7500/io.h
+++ b/include/asm-arm/arch-cl7500/io.h
@@ -92,7 +92,7 @@ extern __inline__ unsigned int __ioaddr (unsigned int port)			\
 
 DECLARE_IO(char,b,"b")
 DECLARE_IO(short,w,"")
-DECLARE_IO(long,l,"")
+DECLARE_IO(int,l,"")
 
 #undef DECLARE_IO
 #undef DECLARE_DYN_IN
diff --git a/include/asm-arm/arch-ebsa110/io.h b/include/asm-arm/arch-ebsa110/io.h
index 4f936f0e9..bca7df287 100644
--- a/include/asm-arm/arch-ebsa110/io.h
+++ b/include/asm-arm/arch-ebsa110/io.h
@@ -67,7 +67,7 @@ extern __inline__ unsigned int __ioaddr (unsigned int port)			\
 
 DECLARE_IO(char,b,"b")
 DECLARE_IO(short,w,"")
-DECLARE_IO(long,l,"")
+DECLARE_IO(int,l,"")
 
 #undef DECLARE_IO
 #undef DECLARE_DYN_OUT
diff --git a/include/asm-arm/arch-ebsa285/io.h b/include/asm-arm/arch-ebsa285/io.h
index 877625fa8..8f24298b2 100644
--- a/include/asm-arm/arch-ebsa285/io.h
+++ b/include/asm-arm/arch-ebsa285/io.h
@@ -45,7 +45,7 @@ extern __inline__ unsigned long ___mem_isa(unsigned long a)
  * Generic virtual read/write
  */
 #define __arch_getb(a)		(*(volatile unsigned char *)(a))
-#define __arch_getl(a)		(*(volatile unsigned long *)(a))
+#define __arch_getl(a)		(*(volatile unsigned int  *)(a))
 
 extern __inline__ unsigned int __arch_getw(unsigned long a)
 {
@@ -58,7 +58,7 @@ extern __inline__ unsigned int __arch_getw(unsigned long a)
 
 
 #define __arch_putb(v,a)	(*(volatile unsigned char *)(a) = (v))
-#define __arch_putl(v,a)	(*(volatile unsigned long *)(a) = (v))
+#define __arch_putl(v,a)	(*(volatile unsigned int  *)(a) = (v))
 
 extern __inline__ void __arch_putw(unsigned int value, unsigned long a)
 {
diff --git a/include/asm-arm/arch-nexuspci/io.h b/include/asm-arm/arch-nexuspci/io.h
index f70fbadbd..3c8d15b3d 100644
--- a/include/asm-arm/arch-nexuspci/io.h
+++ b/include/asm-arm/arch-nexuspci/io.h
@@ -46,7 +46,7 @@ extern __inline__ unsigned int __ioaddr (unsigned int port)			\
 
 DECLARE_IO(char,b,"b","Jr")
 DECLARE_IO(short,w,"h","r")
-DECLARE_IO(long,l,"","Jr")
+DECLARE_IO(int,l,"","Jr")
 
 #undef DECLARE_IO
 #undef DECLARE_DYN_OUT
diff --git a/include/asm-arm/arch-rpc/io.h b/include/asm-arm/arch-rpc/io.h
index 2e093217c..508560bda 100644
--- a/include/asm-arm/arch-rpc/io.h
+++ b/include/asm-arm/arch-rpc/io.h
@@ -90,7 +90,7 @@ extern __inline__ unsigned int __ioaddr (unsigned int port)			\
 
 DECLARE_IO(char,b,"b")
 DECLARE_IO(short,w,"")
-DECLARE_IO(long,l,"")
+DECLARE_IO(int,l,"")
 
 #undef DECLARE_IO
 #undef DECLARE_DYN_IN
diff --git a/include/asm-arm/arch-sa1100/io.h b/include/asm-arm/arch-sa1100/io.h
index 3e0001a1a..d1d8aa11a 100644
--- a/include/asm-arm/arch-sa1100/io.h
+++ b/include/asm-arm/arch-sa1100/io.h
@@ -20,7 +20,7 @@
  * Generic virtual read/write
  */
 #define __arch_getb(a)		(*(volatile unsigned char *)(a))
-#define __arch_getl(a)		(*(volatile unsigned long *)(a))
+#define __arch_getl(a)		(*(volatile unsigned int  *)(a))
 
 extern __inline__ unsigned int __arch_getw(unsigned long a)
 {
@@ -33,7 +33,7 @@ extern __inline__ unsigned int __arch_getw(unsigned long a)
 
 
 #define __arch_putb(v,a)	(*(volatile unsigned char *)(a) = (v))
-#define __arch_putl(v,a)	(*(volatile unsigned long *)(a) = (v))
+#define __arch_putl(v,a)	(*(volatile unsigned int  *)(a) = (v))
 
 extern __inline__ void __arch_putw(unsigned int value, unsigned long a)
 {
diff --git a/include/asm-arm/parport.h b/include/asm-arm/parport.h
index b61c0d62c..fddb4f548 100644
--- a/include/asm-arm/parport.h
+++ b/include/asm-arm/parport.h
@@ -43,6 +43,8 @@ parport_pc_init(int *io, int *io_hi, int *irq, int *dma)
 				count++;
 		} while (*io && (++i < PARPORT_PC_MAX_PORTS));
 	} else {
+		count += parport_pc_init_superio ();
+
 		/* Probe all the likely ports. */
 		if (parport_pc_probe_port(0x3bc, 0x7bc, irq[0], dma[0], NULL))
 			count++;