Merge branch 'linux-2.6'

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 63ef1f6faaed..d11821af3b8d 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -48,12 +48,10 @@
 
 #define LOG_TEMP                0                       /* continously log temperature */
 
-#define I2C_DRIVERID_G4FAN      0x9001                  /* fixme */
-
 static int                      do_probe( struct i2c_adapter *adapter, int addr, int kind);
 
 /* scan 0x48-0x4f (DS1775) and 0x2c-2x2f (ADM1030) */
-static unsigned short           normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
+static const unsigned short     normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
                                                  0x4c, 0x4d, 0x4e, 0x4f,
                                                  0x2c, 0x2d, 0x2e, 0x2f,
                                                  I2C_CLIENT_END };
@@ -361,7 +359,6 @@ static struct i2c_driver g4fan_driver = {
         .driver = {
                 .name   = "therm_windtunnel",
         },
-        .id             = I2C_DRIVERID_G4FAN,
         .attach_adapter = do_attach,
         .detach_client  = do_detach,
 };