diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-17 14:52:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-17 14:53:10 -0400 |
| commit | 45bd00d31de886f8425b4dd33204b911b0a466a9 (patch) | |
| tree | 06204f2452e02ca916666173d50f5035d69065ef /arch/arm/mach-realview/Kconfig | |
| parent | 40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01 (diff) | |
| parent | ab86e5765d41a5eb4239a1c04d613db87bea5ed8 (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: Pick up kernel/softirq.c update for dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-realview/Kconfig')
| -rw-r--r-- | arch/arm/mach-realview/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig index d4cfa2145386..dfc9b0bc6eb2 100644 --- a/arch/arm/mach-realview/Kconfig +++ b/arch/arm/mach-realview/Kconfig | |||
| @@ -75,7 +75,7 @@ config MACH_REALVIEW_PBX | |||
| 75 | 75 | ||
| 76 | config REALVIEW_HIGH_PHYS_OFFSET | 76 | config REALVIEW_HIGH_PHYS_OFFSET |
| 77 | bool "High physical base address for the RealView platform" | 77 | bool "High physical base address for the RealView platform" |
| 78 | depends on !MACH_REALVIEW_PB1176 | 78 | depends on MMU && !MACH_REALVIEW_PB1176 |
| 79 | default y | 79 | default y |
| 80 | help | 80 | help |
| 81 | RealView boards other than PB1176 have the RAM available at | 81 | RealView boards other than PB1176 have the RAM available at |