Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / acorn / char / i2c.c

diff --git a/drivers/acorn/char/i2c.c b/drivers/acorn/char/i2c.c
index e01e4fd..c26c08b 100644 (file)
--- a/drivers/acorn/char/i2c.c
+++ b/drivers/acorn/char/i2c.c
@@ -12,6 +12,7 @@
  *  On Acorn machines, the following i2c devices are on the bus:
  *     - PCF8583 real time clock & static RAM
  */
+#include <linux/capability.h>
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/time.h>
@@ -313,7 +314,7 @@ static struct i2c_algo_bit_data ioc_data = {
 
 static int ioc_client_reg(struct i2c_client *client)
 {
-       if (client->id == I2C_DRIVERID_PCF8583 &&
+       if (client->driver->id == I2C_DRIVERID_PCF8583 &&
            client->addr == 0x50) {
                struct rtc_tm rtctm;
                unsigned int year;