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

..

boot

[ARM] 5229/3: Replace some ARMv7 opcodes with the instruction name

2008-10-03 11:32:09 +01:00

common

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

configs

Merge branch 'for-rmk' of git://git.marvell.com/orion

2008-10-09 21:33:07 +01:00

include/asm

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

kernel

Merge branch 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc

2008-10-13 10:04:04 -07:00

lib

Merge branch 'ptebits' into devel

2008-10-09 21:31:56 +01:00

mach-aaec2000

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

mach-at91

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-clps711x

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-clps7500

[ARM] mm: enable sparsemem on clps7500 and RiscPC

2008-10-01 17:24:04 +01:00

mach-davinci

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-11 10:09:45 -07:00

mach-ebsa110

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-ep93xx

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-footbridge

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-h720x

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-imx

Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git

2008-10-09 21:33:03 +01:00

mach-integrator

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-iop13xx

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-iop32x

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-iop33x

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-ixp4xx

[ARM] Convert asm/delay.h to linux/delay.h

2008-09-06 12:11:37 +01:00

mach-ixp23xx

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-ixp2000

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-kirkwood

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-11 10:09:45 -07:00

mach-ks8695

Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel

2008-10-09 21:31:54 +01:00

mach-l7200

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

mach-lh7a40x

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-loki

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-11 10:09:45 -07:00

mach-msm

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-mv78xx0

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-11 10:09:45 -07:00

mach-mx2

i.MX2: make SoC devices globally available

2008-09-09 10:19:41 +02:00

mach-mx3

Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git

2008-10-09 21:33:05 +01:00

mach-netx

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-ns9xxx

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-omap1

i2c/isp1301_omap: Convert to a new-style i2c driver, part 2

2008-10-14 17:30:02 +02:00

mach-omap2

i2c/isp1301_omap: Convert to a new-style i2c driver, part 2

2008-10-14 17:30:02 +02:00

mach-orion5x

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

2008-10-12 11:51:32 -07:00

mach-pnx4008

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-pxa

V4L/DVB (8687): soc-camera: Move .power and .reset from soc_camera host to sensor driver

2008-10-12 09:36:50 -02:00

mach-realview

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-rpc

[ARM] mm: enable sparsemem on clps7500 and RiscPC

2008-10-01 17:24:04 +01:00

mach-s3c2400

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-s3c2410

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-s3c2412

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-s3c2440

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-s3c2442

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-s3c2443

[ARM] S3C2443: Fix HCLK rate

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

mach-sa1100

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-11 10:09:45 -07:00

mach-shark

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-versatile

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-11 10:09:45 -07:00

mm

Merge branch 'for-rmk' of git://git.marvell.com/orion

2008-10-09 21:33:07 +01:00

nwfpe

[ARM] Convert asm/uaccess.h to linux/uaccess.h

2008-09-06 11:35:55 +01:00

oprofile

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

plat-iop

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

plat-mxc

Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git

2008-10-09 21:33:03 +01:00

plat-omap

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

2008-10-12 11:51:32 -07:00

plat-orion

[ARM] Move include/asm-arm/plat-orion to arch/arm/plat-orion/include/plat

2008-08-09 13:44:58 +02:00

plat-s3c

[ARM] 4518/1: S3C: Rename watchdog configuration options

2007-07-22 16:44:38 +01:00

plat-s3c24xx

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

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

tools

[ARM] Update mach-types

2008-09-25 10:12:25 +01:00

vfp

[ARM] 5227/1: Add the ENDPROC declarations to the .S files

2008-09-01 12:06:34 +01:00

Kconfig

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

Kconfig-nommu

[ARM] 4532/1: allow configuration of processor ID

2007-10-12 23:43:02 +01:00

Kconfig.debug

[ARM] CONFIG_DEBUG_STACK_USAGE

2008-01-26 14:50:06 +00:00

Makefile

[ARM] 5269/1: ARMv7: Use -march=armv7-a as compiler flag

2008-09-30 11:30:54 +01:00