projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d47908b) | patch
staging: android-alarm: Fix namespace collision with upstreamed alarmtimers
authorJohn Stultz <john.stultz@linaro.org>
Thu, 9 Feb 2012 22:24:34 +0000 (14:24 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2012 18:06:19 +0000 (10:06 -0800)
commitf2f28eacf240baffbba5e9744278f85fc62ddd60
tree353c686bb3f78381036f443ec21805c3ba3608aatree | snapshot
parentd47908b20c4cc22c2700ca737252bdc555d4f28acommit | diff
staging: android-alarm: Fix namespace collision with upstreamed alarmtimers

The upstreamed alarmtimers are similar but not quite 100% API
compatibile with the android in-kernel alarm api. To aid the
transition, prefix the the android in-kernel api with android_

CC: Arve Hjønnevåg <arve@android.com>
CC: Android Kernel Team <kernel-team@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/android/alarm-dev.c diff | blob | history
drivers/staging/android/alarm.c diff | blob | history
drivers/staging/android/android_alarm.h diff | blob | history
Domain: System / Kernel;