aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-12-19 20:21:40 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 16:52:41 -0500
commit6dc9c9e8b0b51abd9a332f5f4767df729848d579 (patch)
tree81b1ff186b9aaa1eb283d05b9a27f72aedd4d662 /drivers/staging
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/staging')
-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 c06397139ae1..ce6badded47a 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -93,5 +93,7 @@ source "drivers/staging/frontier/Kconfig"
93 93
94source "drivers/staging/epl/Kconfig" 94source "drivers/staging/epl/Kconfig"
95 95
96source "drivers/staging/android/Kconfig"
97
96endif # !STAGING_EXCLUDE_BUILD 98endif # !STAGING_EXCLUDE_BUILD
97endif # STAGING 99endif # 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/
29obj-$(CONFIG_INPUT_MIMIO) += mimio/ 29obj-$(CONFIG_INPUT_MIMIO) += mimio/
30obj-$(CONFIG_TRANZPORT) += frontier/ 30obj-$(CONFIG_TRANZPORT) += frontier/
31obj-$(CONFIG_EPL) += epl/ 31obj-$(CONFIG_EPL) += epl/
32obj-$(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 @@
1menu "Android"
2
3config ANDROID
4 bool "Android Drivers"
5 default N
6 ---help---
7 Enable support for various drivers needed on the Android platform
8
9endmenu
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 @@
1#include <linux/kernel.h>
2#include <linux/init.h>
3#include <linux/module.h>
4
5static int __init android_init(void)
6{
7 return 0;
8}
9
10static void __exit android_exit(void)
11{
12}
13
14module_init(android_init);
15module_exit(android_exit);
16
17MODULE_AUTHOR("Greg Kroah-Hartman");
18MODULE_LICENSE("GPL");