9 files changed, 23 insertions, 13 deletions

diff --git a/drivers/char/hvc_beat.c b/drivers/char/hvc_beat.c
index 6f019f19be71..e74bb949c289 100644
--- a/drivers/char/hvc_beat.c
+++ b/drivers/char/hvc_beat.c
@@ -97,7 +97,7 @@ static int hvc_beat_config(char *p)
         return 0;
 }
 
-static int hvc_beat_console_init(void)
+static int __init hvc_beat_console_init(void)
 {
         if (hvc_beat_useit && machine_is_compatible("Beat")) {
                 hvc_instantiate(0, 0, &hvc_beat_get_put_ops);
@@ -106,7 +106,7 @@ static int hvc_beat_console_init(void)
 }
 
 /* temp */
-static int hvc_beat_init(void)
+static int __init hvc_beat_init(void)
 {
         struct hvc_struct *hp;
 
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 9b07f7851061..f2e5cb1bedf3 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2251,19 +2251,19 @@ static int __devinit ipmi_of_probe(struct of_device *dev,
                 return ret;
         }
 
-        regsize = get_property(np, "reg-size", &proplen);
+        regsize = of_get_property(np, "reg-size", &proplen);
         if (regsize && proplen != 4) {
                 dev_warn(&dev->dev, PFX "invalid regsize from OF\n");
                 return -EINVAL;
         }
 
-        regspacing = get_property(np, "reg-spacing", &proplen);
+        regspacing = of_get_property(np, "reg-spacing", &proplen);
         if (regspacing && proplen != 4) {
                 dev_warn(&dev->dev, PFX "invalid regspacing from OF\n");
                 return -EINVAL;
         }
 
-        regshift = get_property(np, "reg-shift", &proplen);
+        regshift = of_get_property(np, "reg-shift", &proplen);
         if (regshift && proplen != 4) {
                 dev_warn(&dev->dev, PFX "invalid regshift from OF\n");
                 return -EINVAL;
diff --git a/drivers/macintosh/adb-iop.c b/drivers/macintosh/adb-iop.c
index 17ef5d3c01b4..444696625171 100644
--- a/drivers/macintosh/adb-iop.c
+++ b/drivers/macintosh/adb-iop.c
@@ -19,7 +19,6 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 
-#include <asm/bootinfo.h> 
 #include <asm/macintosh.h> 
 #include <asm/macints.h> 
 #include <asm/mac_iop.h>
diff --git a/drivers/macintosh/ans-lcd.c b/drivers/macintosh/ans-lcd.c
index e54c4d9f6365..73c50bc02095 100644
--- a/drivers/macintosh/ans-lcd.c
+++ b/drivers/macintosh/ans-lcd.c
@@ -14,9 +14,10 @@
 #include <asm/uaccess.h>
 #include <asm/sections.h>
 #include <asm/prom.h>
-#include <asm/ans-lcd.h>
 #include <asm/io.h>
 
+#include "ans-lcd.h"
+
 #define ANSLCD_ADDR             0xf301c000
 #define ANSLCD_CTRL_IX 0x00
 #define ANSLCD_DATA_IX 0x10
diff --git a/drivers/macintosh/ans-lcd.h b/drivers/macintosh/ans-lcd.h
new file mode 100644
index 000000000000..d795b9fd2db6
--- /dev/null
+++ b/drivers/macintosh/ans-lcd.h
@@ -0,0 +1,11 @@
+#ifndef _PPC_ANS_LCD_H
+#define _PPC_ANS_LCD_H
+
+#define ANSLCD_MINOR            156
+
+#define ANSLCD_CLEAR            0x01
+#define ANSLCD_SENDCTRL         0x02
+#define ANSLCD_SETSHORTDELAY    0x03
+#define ANSLCD_SETLONGDELAY     0x04
+
+#endif
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index f25685b9b7cf..276945d51513 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -379,13 +379,10 @@ static int attach_one_thermostat(struct i2c_adapter *adapter, int addr,
         if (thermostat)
                 return 0;
 
-        th = (struct thermostat *)
-                kmalloc(sizeof(struct thermostat), GFP_KERNEL);
-
+        th = kzalloc(sizeof(struct thermostat), GFP_KERNEL);
         if (!th)
                 return -ENOMEM;
 
-        memset(th, 0, sizeof(*th));
         th->clt.addr = addr;
         th->clt.adapter = adapter;
         th->clt.driver = &thermostat_driver;
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 04f3973e3874..f7c509b7a8ea 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -410,7 +410,7 @@ static int __init via_pmu_start(void)
 
         irq = irq_of_parse_and_map(vias, 0);
         if (irq == NO_IRQ) {
-                printk(KERN_ERR "via-pmu: can't map interruptn");
+                printk(KERN_ERR "via-pmu: can't map interrupt\n");
                 return -ENODEV;
         }
         if (request_irq(irq, via_pmu_interrupt, 0, "VIA-PMU", (void *)0)) {
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index 351982bcec1b..f449d775cdf4 100644
--- a/drivers/macintosh/windfarm_smu_sat.c
+++ b/drivers/macintosh/windfarm_smu_sat.c
@@ -380,10 +380,12 @@ static int __init sat_sensors_init(void)
         return i2c_add_driver(&wf_sat_driver);
 }
 
+#if 0   /* uncomment when module_exit() below is uncommented */
 static void __exit sat_sensors_exit(void)
 {
         i2c_del_driver(&wf_sat_driver);
 }
+#endif
 
 module_init(sat_sensors_init);
 /*module_exit(sat_sensors_exit); Uncomment when cleanup is implemented */
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index cc6c73442435..6cd132c75187 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -362,7 +362,7 @@ config MTD_WALNUT
 
 config MTD_EBONY
         tristate "Flash devices mapped on IBM 440GP Ebony"
-        depends on MTD_JEDECPROBE && EBONY
+        depends on MTD_JEDECPROBE && EBONY && !PPC_MERGE
         help
           This enables access routines for the flash chips on the IBM 440GP
           Ebony board. If you have one of these boards and would like to