Russell King 1937f5b918 ARM: fix sa1100 build ... Fix: arch/arm/mach-sa1100/generic.c:117: error: redefinition of 'cpufreq_get' include/linux/cpufreq.h:299: error: previous definition of 'cpufreq_get' was here cpufreq_get() is used on these platforms to tell drivers what the CPU frequency is, and therefore the bus frequency - which is critical for setting the PCMCIA and LCD timings. Adding ifdefs to these drivers to select cpufreq_get() or some other interface adds confusion. Making these drivers use some other interface for the normal paths and cpufreq stuff for the cpufreq notifier is insane as well. (Why x86 can't provide a version of cpufreq_get() which returns the CPU frequency when CPUFREQ is disabled is beyond me, rather than requiring a dummy zero-returning cpufreq_get(). Especially as they do: unsigned long khz = cpufreq_get(cpu); if (!khz) khz = tsc_khz; In other words, if CPUFREQ is disabled, get it from tsc_khz - why not provide a dummy cpufreq_get() which returns tsc_khz?) Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>		2009-12-13 19:38:08 +00:00
..
boot	ARM: add base support for Marvell Dove SoC	2009-11-27 15:43:06 -05:00
common	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
configs	Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux	2009-12-10 21:55:17 -08:00
include/asm	arm: add arch_mmap_check(), get rid of sys_arm_mremap()	2009-12-11 06:34:09 -05:00
kernel	Unify sys_mmap*	2009-12-11 06:44:29 -05:00
lib
mach-aaec2000
mach-at91	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2009-12-09 19:52:01 -08:00
mach-bcmring	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
mach-clps711x	ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug	2009-12-13 16:33:19 +00:00
mach-davinci	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2009-12-09 19:52:01 -08:00
mach-dove	ARM: Add Tauros2 L2 cache controller support	2009-11-27 15:43:21 -05:00
mach-ebsa110
mach-ep93xx
mach-footbridge	ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug	2009-12-13 16:33:19 +00:00
mach-gemini
mach-h720x
mach-integrator	ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug	2009-12-13 16:33:19 +00:00
mach-iop13xx	Merge branch 'devel-stable' into devel	2009-12-05 10:35:33 +00:00
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-ixp23xx	ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug	2009-12-13 16:33:19 +00:00
mach-ixp2000	ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug	2009-12-13 16:33:19 +00:00
mach-kirkwood
mach-ks8695
mach-l7200
mach-lh7a40x	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
mach-loki
mach-mmp	[ARM] pxa: add apmu clock support in mmp	2009-12-01 09:02:51 +08:00
mach-msm	HTC Dream: mmc compilation fixes	2009-12-10 10:14:34 -08:00
mach-mv78xx0
mach-mx1
mach-mx2	mx27: mxt_td60: Add support to SD/MMC	2009-12-02 12:06:14 +01:00
mach-mx3	mx31moboard: fix typo	2009-12-04 13:23:41 +01:00
mach-mx25
mach-mxc91231
mach-netx
mach-nomadik	ARM: 5786/1: Introduce plat-nomadik, MTU code re-organization	2009-11-28 10:22:51 +00:00
mach-ns9xxx
mach-omap1	OMAP: OMAPFB: split omapfb.h	2009-12-09 12:04:06 +02:00
mach-omap2	OMAP: SDP: Enable DSS2 for OMAP3 SDP board	2009-12-09 18:29:38 +02:00
mach-orion5x	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
mach-pnx4008
mach-pxa	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
mach-realview
mach-rpc
mach-s3c24a0/include/mach	ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug	2009-12-13 16:33:19 +00:00
mach-s3c2400	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
mach-s3c2410	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
mach-s3c2412	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
mach-s3c2440	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
mach-s3c2442	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
mach-s3c2443
mach-s3c6400	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
mach-s3c6410	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
mach-s5pc100	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
mach-sa1100	ARM: fix sa1100 build	2009-12-13 19:38:08 +00:00
mach-shark
mach-stmp37xx
mach-stmp378x
mach-u300	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
mach-ux500	ARM: 5832/1: ARM: U8500 Makefile.boot	2009-11-28 10:22:52 +00:00
mach-versatile
mach-w90x900	ARM: 5842/1: add spi resource support for nuc900	2009-12-01 23:08:31 +00:00
mm	fix broken aliasing checks for MAP_FIXED on sparc32, mips, arm and sh	2009-12-11 06:44:59 -05:00
nwfpe
oprofile
plat-iop
plat-mxc	USB: Add EHCI support for MX27 and MX31 based boards	2009-12-11 11:55:18 -08:00
plat-nomadik	ARM: 5833/1: ARM nomadik: enable U8500 for common platform	2009-11-28 10:22:53 +00:00
plat-omap	Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux	2009-12-10 21:55:17 -08:00
plat-orion
plat-pxa	pxa3xx_nand: move pxa3xx_nand.h common into plat directory	2009-12-01 09:02:43 +08:00
plat-s3c	Merge branch 's3c24xx-updates' of git://git.fluff.org/bjdooks/linux	2009-12-09 19:45:58 -08:00
plat-s3c24xx	Merge branch 's3c24xx-updates' of git://git.fluff.org/bjdooks/linux	2009-12-09 19:45:58 -08:00
plat-s3c64xx	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
plat-s5pc1xx	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
plat-samsung	ARM: SAMSUNG: Add plat-samsung as starting point for plat-s3c* moves	2009-12-01 01:28:37 +00:00
plat-stmp3xxx
tools
vfp	ARM: VFP: fix vfp thread init bug and document vfp notifier entry conditions	2009-12-13 16:33:19 +00:00
Kconfig	ARM: fix sa1100 build	2009-12-13 19:38:08 +00:00
Kconfig-nommu
Kconfig.debug	ARM: 5841/1: a driver for on-chip ETM and ETB	2009-12-02 10:25:22 +00:00
Makefile	Merge branch 'devel-stable' into devel	2009-12-05 10:35:33 +00:00