aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/android/Makefile
diff options
context:
space:
mode:
authorRebecca Schultz <rschultz@google.com>2008-07-24 11:22:53 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-16 14:08:17 -0800
commitb6aba85c35baa7d08b7a601b30589bcae607d9e0 (patch)
tree9c687556a29caa86fbdfee524cc51e61f58e0cba /drivers/staging/android/Makefile
parentstaging: android: switch: minor code formatting cleanups (diff)
downloadlinux-dev-b6aba85c35baa7d08b7a601b30589bcae607d9e0.tar.xz
linux-dev-b6aba85c35baa7d08b7a601b30589bcae607d9e0.zip
staging: android: add pmem driver
This adds the Android pmem driver to the staging tree. [At this point in time, it is dependent on the ARM platform, due to some build issues that require it. - gregkh] Signed-off-by: Rebecca Schultz <rschultz@google.com> Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com> Signed-off-by: Dima Zavin <dima@android.com> Signed-off-by: Jamie Gennis <jgennis@google.com> Cc: Brian Swetland <swetland@google.com> Cc: Arve Hjønnevåg <arve@android.com> Cc: Colin Cross <ccross@android.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/android/Makefile')
-rw-r--r--drivers/staging/android/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile
index 36e32bc04a4d..8fd739194d71 100644
--- a/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@ -4,4 +4,5 @@ obj-$(CONFIG_ANDROID_RAM_CONSOLE) += ram_console.o
obj-$(CONFIG_ANDROID_TIMED_OUTPUT) += timed_output.o
obj-$(CONFIG_ANDROID_TIMED_GPIO) += timed_gpio.o
obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER) += lowmemorykiller.o
+obj-$(CONFIG_ANDROID_PMEM) += pmem.o
obj-$(CONFIG_ANDROID_SWITCH) += switch/