Nelson Castillo 55b404fd78 [ARM] S3C24XX: Fix redefine of DEFINE_TIMER() in s3c24xx pwm-clock.c ...

Do not redefine the DEFINE_TIMER macro. Renamed the local macro
to DEFINE_S3C_TIMER.

Signed-off-by: Nelson Castillo <nelsoneci@gmail.com>
[ben-linux@fluff.org: spelling and subject fix]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

2008-10-16 16:48:29 +01:00

..

alpha

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-10-13 17:13:56 +01:00

arm

[ARM] S3C24XX: Fix redefine of DEFINE_TIMER() in s3c24xx pwm-clock.c

2008-10-16 16:48:29 +01:00

avr32

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-10-13 17:13:56 +01:00

blackfin

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6

2008-10-13 10:08:43 -07:00

cris

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-10-13 17:13:56 +01:00

frv

FRV: Wire up new system calls

2008-08-01 13:03:49 -07:00

h8300

Remove asm/a.out.h files for all architectures without a.out support.

2008-09-06 19:30:24 +01:00

ia64

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-10-13 17:13:56 +01:00

m32r

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-10-13 17:13:56 +01:00

m68k

arch/m68k/mm/kmap.c: introduce missing kfree

2008-10-14 10:23:27 -07:00

m68knommu

Remove asm/a.out.h files for all architectures without a.out support.

2008-09-06 19:30:24 +01:00

mips

MIPS: Kill unused <asm/debug.h> inclusions

2008-10-15 12:46:52 +01:00

mn10300

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-10-13 17:13:56 +01:00

parisc

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-10-13 17:13:56 +01:00

powerpc

Merge commit 'origin'

2008-10-15 11:31:54 +11:00

s390

vfs: Use const for kernel parser table

2008-10-13 10:10:37 -07:00

sh

kernel/cpu.c: create a CPU_STARTING cpu_chain notifier

2008-09-08 19:25:24 +02:00

sparc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

2008-10-13 10:07:53 -07:00

sparc64

chmc: Mark %ver register inline asm with __volatile__

2008-10-12 23:56:12 -07:00

um

Merge git://git.infradead.org/users/dwmw2/random-2.6

2008-10-13 09:59:14 -07:00

x86

x86: register a platform RTC device if PNP doesn't describe it

2008-10-14 16:30:14 -07:00

xtensa

xtensa: remove dead CONFIG_BLK_DEV_IDE code

2008-10-13 21:39:34 +02:00

.gitignore

…

Kconfig

Merge branch 'linus' into oprofile-v2

2008-10-13 11:05:51 +02:00