5 files changed, 31 insertions, 0 deletions

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index c06397139ae1..ce6badded47a 100644
--- a/drivers/staging/Kconfig
+++ b/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/drivers/staging/Makefile b/drivers/staging/Makefile
index 53478e84d1dd..9ddcc2bb3365 100644
--- a/drivers/staging/Makefile
+++ b/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/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
new file mode 100644
index 000000000000..229f8d7439ba
--- /dev/null
+++ b/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/drivers/staging/android/Makefile b/drivers/staging/android/Makefile
new file mode 100644
index 000000000000..a551e5317376
--- /dev/null
+++ b/drivers/staging/android/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_ANDROID)                   += android.o
diff --git a/drivers/staging/android/android.c b/drivers/staging/android/android.c
new file mode 100644
index 000000000000..b8ad5f358fd8
--- /dev/null
+++ b/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");