From 3b0ba61cc86dc835caf25bd30d30bf1b1791d562 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 19 Dec 2008 17:21:40 -0800
Subject: Staging: add android framework

From: Greg Kroah-Hartman <gregkh@suse.de>

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>
---
 drivers/staging/Kconfig           |    2 ++
 drivers/staging/Makefile          |    1 +
 drivers/staging/android/Kconfig   |    9 +++++++++
 drivers/staging/android/Makefile  |    1 +
 drivers/staging/android/android.c |   18 ++++++++++++++++++
 5 files changed, 31 insertions(+)
 create mode 100644 drivers/staging/android/Kconfig
 create mode 100644 drivers/staging/android/Makefile
 create mode 100644 drivers/staging/android/android.c

--- /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");
--- /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
--- /dev/null
+++ b/drivers/staging/android/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_ANDROID)			+= android.o
--- 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
--- 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/