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)
committerGrazvydas Ignotas <notasas@gmail.com>
Wed, 25 Apr 2012 22:24:30 +0000 (01:24 +0300)
commit92fd13056257d77ad41c2d179f590209c6f5993c
tree1843ef5afa5d5fefe2653e4a587cf92cfb1dc6e2
parentf9be28e8b11cb43b7cec2fad0fc5d6f16f5a7cdd
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
drivers/staging/android/alarm.c
drivers/staging/android/android_alarm.h