diff --git a/[refs] b/[refs]
index d6abe6795448..e2c4d8c8b397 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 653d1290be3bb04688514bec92c11eb6b7c324a7
+refs/heads/master: 1fa7026ff026012f3a819b49d44dd6267997f379
diff --git a/trunk/drivers/staging/android/Makefile b/trunk/drivers/staging/android/Makefile
index d9b1525550f7..7ea6fbe92f4b 100644
--- a/trunk/drivers/staging/android/Makefile
+++ b/trunk/drivers/staging/android/Makefile
@@ -1,4 +1,3 @@
-obj-$(CONFIG_ANDROID)			+= android.o
 obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o
 obj-$(CONFIG_ANDROID_LOGGER)		+= logger.o
 obj-$(CONFIG_ANDROID_RAM_CONSOLE)	+= ram_console.o
diff --git a/trunk/drivers/staging/android/TODO b/trunk/drivers/staging/android/TODO
new file mode 100644
index 000000000000..e59c5be4be2b
--- /dev/null
+++ b/trunk/drivers/staging/android/TODO
@@ -0,0 +1,10 @@
+TODO:
+	- checkpatch.pl cleanups
+	- sparse fixes
+	- rename files to be not so "generic"
+	- make sure things build as modules properly
+	- add proper arch dependancies as needed
+	- audit userspace interfaces to make sure they are sane
+
+Please send patches to Greg Kroah-Hartman <greg@kroah.com> and Cc:
+Brian Swetland <swetland@google.com>
diff --git a/trunk/drivers/staging/android/android.c b/trunk/drivers/staging/android/android.c
deleted file mode 100644
index b8ad5f358fd8..000000000000
--- a/trunk/drivers/staging/android/android.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/module.h>
-
-static int __init android_init(void)
-{
-	return 0;
-}
-
-static void __exit android_exit(void)
-{
-}
-
-module_init(android_init);
-module_exit(android_exit);
-
-MODULE_AUTHOR("Greg Kroah-Hartman");
-MODULE_LICENSE("GPL");