Merge with mainline to remove plat-omap/Kconfig conflict

Conflicts:
	arch/arm/plat-omap/Kconfig

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index 23741cec45e3..1c4ee6e77937 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -317,13 +317,15 @@ static int __init adb_init(void)
                         break;
                 }
         }
-        if ((adb_controller == NULL) || adb_controller->init()) {
-                printk(KERN_WARNING "Warning: no ADB interface detected\n");
+        if (adb_controller != NULL && adb_controller->init &&
+            adb_controller->init())
                 adb_controller = NULL;
+        if (adb_controller == NULL) {
+                printk(KERN_WARNING "Warning: no ADB interface detected\n");
         } else {
 #ifdef CONFIG_PPC
-                if (machine_is_compatible("AAPL,PowerBook1998") ||
-                        machine_is_compatible("PowerBook1,1"))
+                if (of_machine_is_compatible("AAPL,PowerBook1998") ||
+                        of_machine_is_compatible("PowerBook1,1"))
                         sleepy_trackpad = 1;
 #endif /* CONFIG_PPC */