diff --git a/[refs] b/[refs]
index 1832f4602c3e..f4684bb5804c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cf7c4c692f05e137b65b9a2d7abe5bcb5408820
+refs/heads/master: 6dc9c9e8b0b51abd9a332f5f4767df729848d579
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
index c06397139ae1..ce6badded47a 100644
--- a/trunk/drivers/staging/Kconfig
+++ b/trunk/drivers/staging/Kconfig
@@ -93,5 +93,7 @@ source "drivers/staging/frontier/Kconfig"
 
 source "drivers/staging/epl/Kconfig"
 
+source "drivers/staging/android/Kconfig"
+
 endif # !STAGING_EXCLUDE_BUILD
 endif # STAGING
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
index 53478e84d1dd..9ddcc2bb3365 100644
--- a/trunk/drivers/staging/Makefile
+++ b/trunk/drivers/staging/Makefile
@@ -29,3 +29,4 @@ obj-$(CONFIG_USB_RSPI)		+= rspiusb/
 obj-$(CONFIG_INPUT_MIMIO)	+= mimio/
 obj-$(CONFIG_TRANZPORT)		+= frontier/
 obj-$(CONFIG_EPL)		+= epl/
+obj-$(CONFIG_ANDROID)		+= android/
diff --git a/trunk/drivers/staging/android/Kconfig b/trunk/drivers/staging/android/Kconfig
new file mode 100644
index 000000000000..229f8d7439ba
--- /dev/null
+++ b/trunk/drivers/staging/android/Kconfig
@@ -0,0 +1,9 @@
+menu "Android"
+
+config ANDROID
+	bool "Android Drivers"
+	default N
+	---help---
+	  Enable support for various drivers needed on the Android platform
+
+endmenu
diff --git a/trunk/drivers/staging/android/Makefile b/trunk/drivers/staging/android/Makefile
new file mode 100644
index 000000000000..a551e5317376
--- /dev/null
+++ b/trunk/drivers/staging/android/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_ANDROID)			+= android.o
diff --git a/trunk/drivers/staging/android/android.c b/trunk/drivers/staging/android/android.c
new file mode 100644
index 000000000000..b8ad5f358fd8
--- /dev/null
+++ b/trunk/drivers/staging/android/android.c
@@ -0,0 +1,18 @@
+#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");