Merge branch 'linux-2.6'

4 files changed, 5 insertions, 7 deletions

diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index 5ae28f076d25..7ce0ea64465c 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -854,7 +854,7 @@ adbdev_init(void)
         adb_dev_class = class_create(THIS_MODULE, "adb");
         if (IS_ERR(adb_dev_class))
                 return;
-        class_device_create(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), NULL, "adb");
+        device_create(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), "adb");
 
         platform_device_register(&adb_pfdev);
         platform_driver_probe(&adb_pfdrv, adb_dummy_probe);
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index 192bef5c20b3..18dde2a27209 100644
--- a/drivers/macintosh/mediabay.c
+++ b/drivers/macintosh/mediabay.c
@@ -563,7 +563,8 @@ static void media_bay_step(int i)
                                 ide_init_hwif_ports(&hw, (unsigned long) bay->cd_base, (unsigned long) 0, NULL);
                                 hw.irq = bay->cd_irq;
                                 hw.chipset = ide_pmac;
-                                bay->cd_index = ide_register_hw(&hw, NULL, 0, NULL);
+                                bay->cd_index =
+                                        ide_register_hw(&hw, NULL, NULL);
                                 pmu_resume();
                         }
                         if (bay->cd_index == -1) {
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,
 };
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 82ec12e0edd2..ebec663d5d37 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2482,7 +2482,7 @@ static int pmu_sys_resume(struct sys_device *sysdev)
 #endif /* CONFIG_SUSPEND && CONFIG_PPC32 */
 
 static struct sysdev_class pmu_sysclass = {
-        set_kset_name("pmu"),
+        .name = "pmu",
 };
 
 static struct sys_device device_pmu = {