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

Commit 12035d64 authored by Dave Neuer's avatar Dave Neuer Committed by Russell King
Browse files

[PATCH] ARM: 2706/1: Fix compile on SA-based iPAQs and remove stale CREDITS info 



Patch from Dave Neuer

This fixes the "multiple definitions of cpufreq_get" errors on
StrongARM-based iPAQs.

Signed-off-by: Dave Neuer
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4e71e47d

CREDITS

+1 −5
Original line number Original line Diff line number Diff line
@@ -2475,13 +2475,9 @@ S: Potsdam, New York 13676 
S: USA

S: USA





N: Dave Neuer

N: Dave Neuer

E: dneuer@innovation-charter.com

E: dave.neuer@pobox.com

E: mr_fred_smoothie@yahoo.com

D: Helped implement support for Compaq's H31xx series iPAQs

D: Helped implement support for Compaq's H31xx series iPAQs

D: Other mostly minor tweaks & bugfixes

D: Other mostly minor tweaks & bugfixes

S: 325 E. Main St., Suite 3

S: Carnegie, PA 15105

S: USA





N: Michael Neuffer

N: Michael Neuffer

E: mike@i-Connect.Net

E: mike@i-Connect.Net

arch/arm/Kconfig

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




config CPU_FREQ_SA1100

config CPU_FREQ_SA1100

	bool

	bool

	depends on CPU_FREQ && (SA1100_LART || SA1100_PLEB)

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

	default y

	default y





config CPU_FREQ_SA1110

config CPU_FREQ_SA1110

arch/arm/configs/h3600_defconfig

+15 −9
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.12-rc1-bk2

# Linux kernel version: 2.6.12-rc4

# Mon Mar 28 00:02:26 2005

# Thu Jun  9 01:59:03 2005

#

#

CONFIG_ARM=y

CONFIG_ARM=y

CONFIG_MMU=y

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

CONFIG_EXPERIMENTAL=y

CONFIG_CLEAN_COMPILE=y

CONFIG_CLEAN_COMPILE=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_INIT_ENV_ARG_LIMIT=32





#

#

# General setup

# General setup
@@ -33,6 +34,8 @@ CONFIG_KOBJECT_UEVENT=y 
# CONFIG_EMBEDDED is not set

# CONFIG_EMBEDDED is not set

CONFIG_KALLSYMS=y

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_EXTRA_PASS is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_BASE_FULL=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_EPOLL=y
@@ -120,6 +123,7 @@ CONFIG_CPU_MINICACHE=y 
# Bus support

# Bus support

#

#

CONFIG_ISA=y

CONFIG_ISA=y

CONFIG_ISA_DMA_API=y





#

#

# PCCARD (PCMCIA/CardBus) support

# PCCARD (PCMCIA/CardBus) support
@@ -138,6 +142,7 @@ CONFIG_PCMCIA_SA1100=y 
#

#

# Kernel Features

# Kernel Features

#

#

# CONFIG_SMP is not set

# CONFIG_PREEMPT is not set

# CONFIG_PREEMPT is not set

CONFIG_DISCONTIGMEM=y

CONFIG_DISCONTIGMEM=y

# CONFIG_LEDS is not set

# CONFIG_LEDS is not set
@@ -159,12 +164,13 @@ CONFIG_CPU_FREQ_TABLE=y 
# CONFIG_CPU_FREQ_DEBUG is not set

# CONFIG_CPU_FREQ_DEBUG is not set

CONFIG_CPU_FREQ_STAT=y

CONFIG_CPU_FREQ_STAT=y

# CONFIG_CPU_FREQ_STAT_DETAILS is not set

# CONFIG_CPU_FREQ_STAT_DETAILS is not set

CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set

# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set

CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_PERFORMANCE=y

# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set

# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set

# 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_ONDEMAND is not set

CONFIG_CPU_FREQ_SA1100=y





#

#

# Floating point emulation

# Floating point emulation
@@ -298,7 +304,6 @@ CONFIG_MTD_SA1100=y 
#

#

# Block devices

# Block devices

#

#

# CONFIG_BLK_DEV_FD is not set

# CONFIG_BLK_DEV_XD is not set

# CONFIG_BLK_DEV_XD is not set

# CONFIG_BLK_DEV_COW_COMMON is not set

# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_LOOP=m
@@ -379,7 +384,6 @@ CONFIG_NET=y 
# Networking options

# Networking options

#

#

# CONFIG_PACKET is not set

# CONFIG_PACKET is not set

# CONFIG_NETLINK_DEV is not set

CONFIG_UNIX=y

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

# CONFIG_NET_KEY is not set

CONFIG_INET=y

CONFIG_INET=y
@@ -476,6 +480,7 @@ CONFIG_IRCOMM=m 
# CONFIG_SMC_IRCC_FIR is not set

# CONFIG_SMC_IRCC_FIR is not set

# CONFIG_ALI_FIR is not set

# CONFIG_ALI_FIR is not set

CONFIG_SA1100_FIR=m

CONFIG_SA1100_FIR=m

# CONFIG_VIA_FIR is not set

# CONFIG_BT is not set

# CONFIG_BT is not set

CONFIG_NETDEVICES=y

CONFIG_NETDEVICES=y

# CONFIG_DUMMY is not set

# CONFIG_DUMMY is not set
@@ -647,7 +652,6 @@ CONFIG_LEGACY_PTY_COUNT=256 
#

#

# TPM devices

# TPM devices

#

#

# CONFIG_TCG_TPM is not set





#

#

# I2C support

# I2C support
@@ -676,9 +680,11 @@ CONFIG_FB_CFB_FILLRECT=y 
CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

CONFIG_FB_CFB_IMAGEBLIT=y

CONFIG_FB_SOFT_CURSOR=y

CONFIG_FB_SOFT_CURSOR=y

# CONFIG_FB_MACMODES is not set

# CONFIG_FB_MODE_HELPERS is not set

# CONFIG_FB_MODE_HELPERS is not set

# CONFIG_FB_TILEBLITTING is not set

# CONFIG_FB_TILEBLITTING is not set

CONFIG_FB_SA1100=y

CONFIG_FB_SA1100=y

# CONFIG_FB_S1D13XXX is not set

# CONFIG_FB_VIRTUAL is not set

# CONFIG_FB_VIRTUAL is not set





#

#

arch/arm/mach-sa1100/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -150,7 +150,7 @@ config SA1100_SSP 




config H3600_SLEEVE

config H3600_SLEEVE

	tristate "Compaq iPAQ Handheld sleeve support"

	tristate "Compaq iPAQ Handheld sleeve support"

	depends on SA1100_H3600

	depends on SA1100_H3100 || SA1100_H3600

	help

	help

	  Choose this option to enable support for extension packs (sleeves)

	  Choose this option to enable support for extension packs (sleeves)

	  for the Compaq iPAQ H3XXX series of handheld computers.  This option

	  for the Compaq iPAQ H3XXX series of handheld computers.  This option