]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb0f9d74638aec5f83ffe24e37f0fdd85436d2ee4
tree353c686bb3f78381036f443ec21805c3ba3608aa
parentb1076859ad634decf62832206d1ebc6f1d8b0cf9
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