diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 10:58:25 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 10:58:25 -0800 |
commit | b91867f2ee5c84b550f95ce54c91b180f70f48cb (patch) | |
tree | bd7a5be4484d539af13e6b345320455e989612cf /drivers/staging/android/Makefile | |
parent | b05ee6bf9e6c7acc38dca1466b63bb24ae5df6f3 (diff) | |
parent | 9196dc1129fbb3ecf93027224a6bdbc86d086e3a (diff) | |
download | op-kernel-dev-b91867f2ee5c84b550f95ce54c91b180f70f48cb.zip op-kernel-dev-b91867f2ee5c84b550f95ce54c91b180f70f48cb.tar.gz |
Merge tag 'staging-3.3-rc3' into staging-next
This was done to resolve some merge issues with the following files that
had changed in both branches:
drivers/staging/rtl8712/rtl871x_sta_mgt.c
drivers/staging/tidspbridge/rmgr/drv_interface.c
drivers/staging/zcache/zcache-main.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/Makefile')
-rw-r--r-- | drivers/staging/android/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile index 5fcc24f..785f269 100644 --- a/drivers/staging/android/Makefile +++ b/drivers/staging/android/Makefile @@ -6,3 +6,5 @@ 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_SWITCH) += switch/ +obj-$(CONFIG_ANDROID_INTF_ALARM) += alarm.o +obj-$(CONFIG_ANDROID_INTF_ALARM_DEV) += alarm-dev.o |