This repository has been archived on 2026-03-14. You can view files and clone it, but cannot push or open issues or pull requests.

Tushar Behera 266328fd18 alarmtimer: Fix conflicting definitions of alarmtimer_get_rtcdev ...

Both the implementation in kernel/time/alarmtime.c have same definition.

This fixes following compile-time error.

kernel/time/alarmtimer.c:113:46: error: macro "alarmtimer_get_rtcdev" passed 1 arguments, but takes just 0
kernel/time/alarmtimer.c:114:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
make[2]: *** [kernel/time/alarmtimer.o] Error 1

Change-Id: Ib5eb4b3fb0cd5077d19cc4d91e823aa253779b4d
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>

2012-05-07 18:10:40 -07:00

..

acpi

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-03-30 16:45:39 -07:00

asm-generic

asm-generic: Allow overriding clock_t and add attributes to siginfo_t

2012-04-23 16:29:18 -07:00

crypto

crypto: user - Fix lookup of algorithms with IV generator

2012-03-29 19:52:47 +08:00

drm

Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes

2012-04-12 17:42:01 +01:00

keys

…

linux

alarmtimer: Fix conflicting definitions of alarmtimer_get_rtcdev

2012-05-07 18:10:40 -07:00

math-emu

…

media

Merge tag 'device-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2012-03-24 10:41:37 -07:00

misc

…

mtd

…

net

Merge commit 'v3.4-rc5' into android-3.4

2012-05-01 15:47:09 -07:00

pcmcia

…

rdma

…

rxrpc

…

scsi

SCSI: Fix error handling when no ULD is attached

2012-04-15 11:08:53 -07:00

sound

ALSA: hda - hide HDMI/ELD printks unless snd.debug=2

2012-04-10 14:53:55 +02:00

target

…

trace

cpufreq: interactive: add boost pulse interface

2012-05-03 17:41:51 -07:00

video

Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm

2012-03-27 18:17:02 -07:00

xen

Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-04-04 17:13:43 -07:00

Kbuild

…