1
linux/arch
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
..
alpha Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 2009-12-11 15:31:13 -08:00
arm ARM: fix sa1100 build 2009-12-13 19:38:08 +00:00
avr32 Unify sys_mmap* 2009-12-11 06:44:29 -05:00
blackfin Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 2009-12-11 15:31:13 -08:00
cris Unify sys_mmap* 2009-12-11 06:44:29 -05:00
frv Unify sys_mmap* 2009-12-11 06:44:29 -05:00
h8300 Unify sys_mmap* 2009-12-11 06:44:29 -05:00
ia64 Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/mmap 2009-12-11 12:23:29 -08:00
m32r Unify sys_mmap* 2009-12-11 06:44:29 -05:00
m68k Unify sys_mmap* 2009-12-11 06:44:29 -05:00
m68knommu Unify sys_mmap* 2009-12-11 06:44:29 -05:00
microblaze Unify sys_mmap* 2009-12-11 06:44:29 -05:00
mips Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 2009-12-11 15:31:13 -08:00
mn10300 Unify sys_mmap* 2009-12-11 06:44:29 -05:00
parisc Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 2009-12-11 15:31:13 -08:00
powerpc Unify sys_mmap* 2009-12-11 06:44:29 -05:00
s390 Unify sys_mmap* 2009-12-11 06:44:29 -05:00
score Add missing alignment check in arch/score sys_mmap() 2009-12-11 06:48:57 -05:00
sh fix broken aliasing checks for MAP_FIXED on sparc32, mips, arm and sh 2009-12-11 06:44:59 -05:00
sparc Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 2009-12-11 15:31:13 -08:00
um Unify sys_mmap* 2009-12-11 06:44:29 -05:00
x86 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-12-11 20:47:59 -08:00
xtensa Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 2009-12-11 15:34:40 -08:00
.gitignore
Kconfig Merge branch 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm 2009-12-08 08:02:38 -08:00