fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / i2c / busses / i2c-rpx.c

diff --git a/drivers/i2c/busses/i2c-rpx.c b/drivers/i2c/busses/i2c-rpx.c
index 5d4ee2c..8764df0 100644 (file)
--- a/drivers/i2c/busses/i2c-rpx.c
+++ b/drivers/i2c/busses/i2c-rpx.c
@@ -11,7 +11,6 @@
  * changed to eliminate RPXLite references.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -50,16 +49,16 @@ rpx_iic_init(struct i2c_algo_8xx_data *data)
        /* Allocate space for two transmit and two receive buffer
         * descriptors in the DP ram.
         */
-       data->dp_addr = m8xx_cpm_dpalloc(sizeof(cbd_t) * 4);
-
+       data->dp_addr = cpm_dpalloc(sizeof(cbd_t) * 4, 8);
+               
        /* ptr to i2c area */
        data->i2c = (i2c8xx_t *)&(((immap_t *)IMAP_ADDR)->im_i2c);
 }
 
-static int rpx_install_isr(int irq, void (*func)(void *, void *), void *data)
+static int rpx_install_isr(int irq, void (*func)(void *), void *data)
 {
        /* install interrupt handler */
-       cpm_install_handler(irq, (void (*)(void *, struct pt_regs *)) func, data);
+       cpm_install_handler(irq, func, data);
 
        return 0;
 }