Commit 12035d64565ae7ecbc7fe906e7fcc8a4a71a3789
Committed by
Russell King
1 parent
4e71e47da3
[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: Russell King <rmk+kernel@arm.linux.org.uk>
Showing 4 changed files with 18 additions and 16 deletions Side-by-side Diff
CREDITS
... | ... | @@ -2475,13 +2475,9 @@ |
2475 | 2475 | S: USA |
2476 | 2476 | |
2477 | 2477 | N: Dave Neuer |
2478 | -E: dneuer@innovation-charter.com | |
2479 | -E: mr_fred_smoothie@yahoo.com | |
2478 | +E: dave.neuer@pobox.com | |
2480 | 2479 | D: Helped implement support for Compaq's H31xx series iPAQs |
2481 | 2480 | D: Other mostly minor tweaks & bugfixes |
2482 | -S: 325 E. Main St., Suite 3 | |
2483 | -S: Carnegie, PA 15105 | |
2484 | -S: USA | |
2485 | 2481 | |
2486 | 2482 | N: Michael Neuffer |
2487 | 2483 | E: mike@i-Connect.Net |
arch/arm/Kconfig
... | ... | @@ -497,7 +497,7 @@ |
497 | 497 | |
498 | 498 | config CPU_FREQ_SA1100 |
499 | 499 | bool |
500 | - depends on CPU_FREQ && (SA1100_LART || SA1100_PLEB) | |
500 | + depends on CPU_FREQ && (SA1100_H3100 || SA1100_H3600 || SA1100_H3800 || SA1100_LART || SA1100_PLEB) | |
501 | 501 | default y |
502 | 502 | |
503 | 503 | config CPU_FREQ_SA1110 |
arch/arm/configs/h3600_defconfig
1 | 1 | # |
2 | 2 | # Automatically generated make config: don't edit |
3 | -# Linux kernel version: 2.6.12-rc1-bk2 | |
4 | -# Mon Mar 28 00:02:26 2005 | |
3 | +# Linux kernel version: 2.6.12-rc4 | |
4 | +# Thu Jun 9 01:59:03 2005 | |
5 | 5 | # |
6 | 6 | CONFIG_ARM=y |
7 | 7 | CONFIG_MMU=y |
... | ... | @@ -16,6 +16,7 @@ |
16 | 16 | CONFIG_EXPERIMENTAL=y |
17 | 17 | CONFIG_CLEAN_COMPILE=y |
18 | 18 | CONFIG_BROKEN_ON_SMP=y |
19 | +CONFIG_INIT_ENV_ARG_LIMIT=32 | |
19 | 20 | |
20 | 21 | # |
21 | 22 | # General setup |
... | ... | @@ -33,6 +34,8 @@ |
33 | 34 | # CONFIG_EMBEDDED is not set |
34 | 35 | CONFIG_KALLSYMS=y |
35 | 36 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
37 | +CONFIG_PRINTK=y | |
38 | +CONFIG_BUG=y | |
36 | 39 | CONFIG_BASE_FULL=y |
37 | 40 | CONFIG_FUTEX=y |
38 | 41 | CONFIG_EPOLL=y |
... | ... | @@ -120,6 +123,7 @@ |
120 | 123 | # Bus support |
121 | 124 | # |
122 | 125 | CONFIG_ISA=y |
126 | +CONFIG_ISA_DMA_API=y | |
123 | 127 | |
124 | 128 | # |
125 | 129 | # PCCARD (PCMCIA/CardBus) support |
... | ... | @@ -138,6 +142,7 @@ |
138 | 142 | # |
139 | 143 | # Kernel Features |
140 | 144 | # |
145 | +# CONFIG_SMP is not set | |
141 | 146 | # CONFIG_PREEMPT is not set |
142 | 147 | CONFIG_DISCONTIGMEM=y |
143 | 148 | # CONFIG_LEDS is not set |
144 | 149 | |
145 | 150 | |
... | ... | @@ -159,12 +164,13 @@ |
159 | 164 | # CONFIG_CPU_FREQ_DEBUG is not set |
160 | 165 | CONFIG_CPU_FREQ_STAT=y |
161 | 166 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set |
162 | -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | |
163 | -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | |
164 | -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | |
167 | +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set | |
168 | +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y | |
169 | +# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set | |
165 | 170 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set |
166 | -# CONFIG_CPU_FREQ_GOV_USERSPACE is not set | |
171 | +CONFIG_CPU_FREQ_GOV_USERSPACE=y | |
167 | 172 | # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set |
173 | +CONFIG_CPU_FREQ_SA1100=y | |
168 | 174 | |
169 | 175 | # |
170 | 176 | # Floating point emulation |
... | ... | @@ -298,7 +304,6 @@ |
298 | 304 | # |
299 | 305 | # Block devices |
300 | 306 | # |
301 | -# CONFIG_BLK_DEV_FD is not set | |
302 | 307 | # CONFIG_BLK_DEV_XD is not set |
303 | 308 | # CONFIG_BLK_DEV_COW_COMMON is not set |
304 | 309 | CONFIG_BLK_DEV_LOOP=m |
... | ... | @@ -379,7 +384,6 @@ |
379 | 384 | # Networking options |
380 | 385 | # |
381 | 386 | # CONFIG_PACKET is not set |
382 | -# CONFIG_NETLINK_DEV is not set | |
383 | 387 | CONFIG_UNIX=y |
384 | 388 | # CONFIG_NET_KEY is not set |
385 | 389 | CONFIG_INET=y |
... | ... | @@ -476,6 +480,7 @@ |
476 | 480 | # CONFIG_SMC_IRCC_FIR is not set |
477 | 481 | # CONFIG_ALI_FIR is not set |
478 | 482 | CONFIG_SA1100_FIR=m |
483 | +# CONFIG_VIA_FIR is not set | |
479 | 484 | # CONFIG_BT is not set |
480 | 485 | CONFIG_NETDEVICES=y |
481 | 486 | # CONFIG_DUMMY is not set |
... | ... | @@ -647,7 +652,6 @@ |
647 | 652 | # |
648 | 653 | # TPM devices |
649 | 654 | # |
650 | -# CONFIG_TCG_TPM is not set | |
651 | 655 | |
652 | 656 | # |
653 | 657 | # I2C support |
654 | 658 | |
... | ... | @@ -676,9 +680,11 @@ |
676 | 680 | CONFIG_FB_CFB_COPYAREA=y |
677 | 681 | CONFIG_FB_CFB_IMAGEBLIT=y |
678 | 682 | CONFIG_FB_SOFT_CURSOR=y |
683 | +# CONFIG_FB_MACMODES is not set | |
679 | 684 | # CONFIG_FB_MODE_HELPERS is not set |
680 | 685 | # CONFIG_FB_TILEBLITTING is not set |
681 | 686 | CONFIG_FB_SA1100=y |
687 | +# CONFIG_FB_S1D13XXX is not set | |
682 | 688 | # CONFIG_FB_VIRTUAL is not set |
683 | 689 | |
684 | 690 | # |
arch/arm/mach-sa1100/Kconfig
... | ... | @@ -150,7 +150,7 @@ |
150 | 150 | |
151 | 151 | config H3600_SLEEVE |
152 | 152 | tristate "Compaq iPAQ Handheld sleeve support" |
153 | - depends on SA1100_H3600 | |
153 | + depends on SA1100_H3100 || SA1100_H3600 | |
154 | 154 | help |
155 | 155 | Choose this option to enable support for extension packs (sleeves) |
156 | 156 | for the Compaq iPAQ H3XXX series of handheld computers. This option |