Merge davem@nuts.ninka.net:/disk1/davem/BK/sparc-2.5

into kernel.bkbits.net:/home/davem/sparc-2.5

drivers/i2c/busses/i2c-i810.c

@@ -40,6 +40,7 @@
 #include <linux/pci.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
+#include <asm/io.h>
 
 /* GPIO register locations */
 #define I810_IOCONTROL_OFFSET	0x5000

drivers/i2c/busses/i2c-prosavage.c

@@ -59,7 +59,7 @@
 #include <linux/pci.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
-
+#include <asm/io.h>
 
 /*
  * driver configuration

drivers/i2c/busses/i2c-savage4.c

@@ -37,6 +37,7 @@
 #include <linux/pci.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
+#include <asm/io.h>
 
 /* 3DFX defines */
 #define PCI_CHIP_SAVAGE3D	0x8A20

drivers/i2c/busses/i2c-sis5595.c

@@ -63,6 +63,7 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
+#include <asm/io.h>
 
 static int blacklist[] = {
 	PCI_DEVICE_ID_SI_540,

drivers/i2c/busses/i2c-sis630.c

@@ -56,7 +56,7 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
-
+#include <asm/io.h>
 
 /* SIS630 SMBus registers */
 #define SMB_STS			0x80	/* status */

drivers/i2c/busses/i2c-via.c

@@ -30,6 +30,7 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
+#include <asm/io.h>
 
 /* Power management registers */
 #define PM_CFG_REVID	0x08	/* silicon revision code */

drivers/i2c/busses/i2c-voodoo3.c

@@ -33,6 +33,7 @@
 #include <linux/pci.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
+#include <asm/io.h>
 
 /* the only registers we use */
 #define REG		0x78

include/asm-sparc/atomic.h

@@ -33,9 +33,9 @@ typedef struct { volatile int counter; } atomic_t;
  *	 31                          8 7      0
  */
 
-#define ATOMIC_INIT(i)	{ (i << 8) }
+#define ATOMIC_INIT(i)	{ ((i) << 8) }
 
-static __inline__ int atomic_read(atomic_t *v)
+static __inline__ int atomic_read(const atomic_t *v)
 {
 	int ret = v->counter;