diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-20 08:38:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-20 08:38:55 -0400 |
| commit | dfacc4d6c98b89609250269f518c1f54c30454ef (patch) | |
| tree | e7effbee7bdc85d18f7b26ab9cb5c9f700d1481a /arch/arm/mach-sa1100/Kconfig | |
| parent | f869097e884d8cb65b2bb7831ca57b7dffb66fdd (diff) | |
| parent | 85cb68b27c428d477169f3aa46c72dba103a17bd (diff) | |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'arch/arm/mach-sa1100/Kconfig')
| -rw-r--r-- | arch/arm/mach-sa1100/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig index b17d52f7cc48..fd4c52b7ccb6 100644 --- a/arch/arm/mach-sa1100/Kconfig +++ b/arch/arm/mach-sa1100/Kconfig | |||
| @@ -57,7 +57,7 @@ config SA1100_COLLIE | |||
| 57 | config SA1100_H3100 | 57 | config SA1100_H3100 |
| 58 | bool "Compaq iPAQ H3100" | 58 | bool "Compaq iPAQ H3100" |
| 59 | select HTC_EGPIO | 59 | select HTC_EGPIO |
| 60 | select CPU_FREQ_SA1100 | 60 | select CPU_FREQ_SA1110 |
| 61 | help | 61 | help |
| 62 | Say Y here if you intend to run this kernel on the Compaq iPAQ | 62 | Say Y here if you intend to run this kernel on the Compaq iPAQ |
| 63 | H3100 handheld computer. Information about this machine and the | 63 | H3100 handheld computer. Information about this machine and the |
| @@ -68,7 +68,7 @@ config SA1100_H3100 | |||
| 68 | config SA1100_H3600 | 68 | config SA1100_H3600 |
| 69 | bool "Compaq iPAQ H3600/H3700" | 69 | bool "Compaq iPAQ H3600/H3700" |
| 70 | select HTC_EGPIO | 70 | select HTC_EGPIO |
| 71 | select CPU_FREQ_SA1100 | 71 | select CPU_FREQ_SA1110 |
| 72 | help | 72 | help |
| 73 | Say Y here if you intend to run this kernel on the Compaq iPAQ | 73 | Say Y here if you intend to run this kernel on the Compaq iPAQ |
| 74 | H3600 handheld computer. Information about this machine and the | 74 | H3600 handheld computer. Information about this machine and the |