aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-12-19 17:21:40 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 13:52:41 -0800
commit6dc9c9e8b0b51abd9a332f5f4767df729848d579 (patch)
tree81b1ff186b9aaa1eb283d05b9a27f72aedd4d662 /drivers
parent4cf7c4c692f05e137b65b9a2d7abe5bcb5408820 (diff)
Staging: add android framework
This prepares us to start adding the android drivers to the build. The dummy android.c file will go away in the next few patches, as it will not be needed once drivers/staging/android/ has a driver in it. Cc: Robert Love <rlove@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/Kconfig2
-rw-r--r--drivers/staging/Makefile1
-rw-r--r--drivers/staging/android/Kconfig9
-rw-r--r--drivers/staging/android/Makefile1
-rw-r--r--drivers/staging/android/android.c18
5 files changed, 31 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index c06397139ae..ce6badded47 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 53478e84d1d..9ddcc2bb336 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 00000000000..229f8d7439b
--- /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 00000000000..a551e531737
--- /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 00000000000..b8ad5f358fd
--- /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");