Merge bk://dsaxena.bkbits.net/linux-2.6-for-rmk

into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-rmk

arch/arm/common/dmabounce.c

@@ -185,7 +185,7 @@ find_safe_buffer(struct dmabounce_device_info *device_info, dma_addr_t safe_dma_
 static inline void
 free_safe_buffer(struct dmabounce_device_info *device_info, struct safe_buffer *buf)
 {
-	dev_dbg(dev_info->dev, "%s(buf=%p)\n", __func__, buf);
+	dev_dbg(device_info->dev, "%s(buf=%p)\n", __func__, buf);
 
 	list_del(&buf->node);
 

include/asm-arm/arch-ixp4xx/ixp4xx-regs.h

@@ -224,7 +224,7 @@
 #define IXP4XX_OST_ENABLE		0x00000001
 #define IXP4XX_OST_ONE_SHOT		0x00000002
 /* Low order bits of reload value ignored */
-#define IXP4XX_OST_RELOAD_MASK		0x00000004
+#define IXP4XX_OST_RELOAD_MASK		0x00000003
 #define IXP4XX_OST_DISABLED		0x00000000
 #define IXP4XX_OSST_TIMER_1_PEND	0x00000001
 #define IXP4XX_OSST_TIMER_2_PEND	0x00000002

include/asm-arm/arch-ixp4xx/timex.h

@@ -6,7 +6,8 @@
 #include <asm/hardware.h>
 
 /*
- * We use IXP425 General purpose timer for our timer needs, it runs at 66 MHz
+ * We use IXP425 General purpose timer for our timer needs, it runs at 
+ * 66.66... MHz
  */
-#define CLOCK_TICK_RATE (IXP4XX_PERIPHERAL_BUS_CLOCK * 1000000)
+#define CLOCK_TICK_RATE (66666666)