Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07c6d48f authored by Vincent Sanders's avatar Vincent Sanders Committed by Russell King
Browse files

[PATCH] ARM: 2708/1: Fix hackkit CPU Frequency build faliure 



Patch from Vincent Sanders

This fixes the "multiple definitions of cpufreq_get" build faliure on
the hackkit SA1100 platform.

Signed-off-by: Vincent Sanders
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7aa0b0d5

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ source "drivers/cpufreq/Kconfig" 


config CPU_FREQ_SA1100

	bool

	depends on CPU_FREQ && (SA1100_H3100 || SA1100_H3600 || SA1100_H3800 || SA1100_LART || SA1100_PLEB || SA1100_BADGE4)

	depends on CPU_FREQ && (SA1100_H3100 || SA1100_H3600 || SA1100_H3800 || SA1100_LART || SA1100_PLEB || SA1100_BADGE4 || SA1100_HACKKIT)

	default y



config CPU_FREQ_SA1110

arch/arm/configs/hackkit_defconfig

+12 −10
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.12-rc1-bk2

# Mon Mar 28 00:22:34 2005

# Linux kernel version: 2.6.12-rc6-git3

# Thu Jun  9 20:58:58 2005

#

CONFIG_ARM=y

CONFIG_MMU=y
@@ -16,6 +16,7 @@ CONFIG_GENERIC_IOMAP=y 
CONFIG_EXPERIMENTAL=y

CONFIG_CLEAN_COMPILE=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_INIT_ENV_ARG_LIMIT=32



#

# General setup
@@ -34,6 +35,8 @@ CONFIG_KOBJECT_UEVENT=y 
CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y
@@ -109,7 +112,6 @@ CONFIG_CPU_ABRT_EV4=y 
CONFIG_CPU_CACHE_V4WB=y

CONFIG_CPU_CACHE_VIVT=y

CONFIG_CPU_TLB_V4WB=y

CONFIG_CPU_MINICACHE=y



#

# Processor Features
@@ -119,6 +121,7 @@ CONFIG_CPU_MINICACHE=y 
# Bus support

#

CONFIG_ISA=y

CONFIG_ISA_DMA_API=y



#

# PCCARD (PCMCIA/CardBus) support
@@ -128,6 +131,7 @@ CONFIG_ISA=y 
#

# Kernel Features

#

# CONFIG_SMP is not set

# CONFIG_PREEMPT is not set

CONFIG_DISCONTIGMEM=y

CONFIG_LEDS=y
@@ -151,12 +155,14 @@ CONFIG_CPU_FREQ_TABLE=y 
# CONFIG_CPU_FREQ_DEBUG is not set

CONFIG_CPU_FREQ_STAT=y

# CONFIG_CPU_FREQ_STAT_DETAILS is not set

CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set

# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set

CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_PERFORMANCE=y

# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set

# CONFIG_CPU_FREQ_GOV_USERSPACE is not set

CONFIG_CPU_FREQ_GOV_USERSPACE=y

# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set

# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set

CONFIG_CPU_FREQ_SA1100=y



#

# Floating point emulation
@@ -280,7 +286,6 @@ CONFIG_MTD_CFI_UTIL=y 
#

# Block devices

#

# CONFIG_BLK_DEV_FD is not set

# CONFIG_BLK_DEV_XD is not set

# CONFIG_BLK_DEV_COW_COMMON is not set

# CONFIG_BLK_DEV_LOOP is not set
@@ -338,7 +343,6 @@ CONFIG_NET=y 
#

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

# CONFIG_NETLINK_DEV is not set

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_INET=y
@@ -484,7 +488,6 @@ CONFIG_SERIO=y 
CONFIG_SERIO_SERPORT=y

# CONFIG_SERIO_RAW is not set

# CONFIG_GAMEPORT is not set

CONFIG_SOUND_GAMEPORT=y



#

# Character devices
@@ -533,7 +536,6 @@ CONFIG_LEGACY_PTY_COUNT=256 
#

# TPM devices

#

# CONFIG_TCG_TPM is not set



#

# I2C support