Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / include / linux / adb.h

diff --git a/include/linux/adb.h b/include/linux/adb.h
index 64d8878e14440656125e3b0f55024781026c244f..63bca502fa55edf8ffd9df6e7c44f2c4c2f83e3c 100644 (file)
--- a/include/linux/adb.h
+++ b/include/linux/adb.h
@@ -84,7 +84,6 @@ enum adb_message {
     ADB_MSG_PRE_RESET, /* Called before resetting the bus */
     ADB_MSG_POST_RESET /* Called after resetting the bus (re-do init & register) */
 };
-extern struct adb_driver *adb_controller;
 extern struct blocking_notifier_head adb_client_list;
 
 int adb_request(struct adb_request *req, void (*done)(struct adb_request *),