diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-22 17:56:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-22 17:56:13 -0400 |
commit | 9e268beb92ee3a853b3946e84b10358207e2085f (patch) | |
tree | dec36344c8b16d53e56763aa174dd7ea806b653f /arch/arm/mach-s3c2442/Kconfig | |
parent | 2e8b5a09ebf1f98f02c1988a48415e89d4c25168 (diff) | |
parent | 9ccdac3662dbf3c75e8f8851a214bdf7d365a4bd (diff) |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (49 commits)
[ARM] idle: clean up pm_idle calling, obey hlt_counter
[ARM] S3C: Fix gpio-config off-by-one bug
[ARM] S3C64XX: add to_irq() support for EINT() GPIO
[ARM] S3C64XX: clock.c: fix typo in usb-host clock ctrlbit
[ARM] S3C64XX: fix HCLK gate defines
[ARM] Update mach-types
[ARM] wire up rt_tgsigqueueinfo and perf_counter_open
OMAP2 clock/powerdomain: off by 1 error in loop timeout comparisons
OMAP3 SDRC: set FIXEDDELAY when disabling SDRC DLL
OMAP3: Add support for DPLL3 divisor values higher than 2
OMAP3 SRAM: convert SRAM code to use macros rather than magic numbers
OMAP3 SRAM: add more comments on the SRAM code
OMAP3 clock/SDRC: program SDRC_MR register during SDRC clock change
OMAP3 clock: add a short delay when lowering CORE clk rate
OMAP3 clock: initialize SDRC timings at kernel start
OMAP3 clock: remove wait for DPLL3 M2 clock to stabilize
[ARM] Add old Feroceon support to compressed/head.S
[ARM] 5559/1: Limit the stack unwinding caused by a kthread exit
[ARM] 5558/1: Add extra checks to ARM unwinder to avoid tracing corrupt stacks
[ARM] 5557/1: Discard some ARM.ex*.*exit.text sections when !HOTPLUG or !HOTPLUG_CPU
...
Diffstat (limited to 'arch/arm/mach-s3c2442/Kconfig')
-rw-r--r-- | arch/arm/mach-s3c2442/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig index b289d198020e..103e913f2258 100644 --- a/arch/arm/mach-s3c2442/Kconfig +++ b/arch/arm/mach-s3c2442/Kconfig | |||
@@ -24,6 +24,18 @@ config SMDK2440_CPU2442 | |||
24 | depends on ARCH_S3C2440 | 24 | depends on ARCH_S3C2440 |
25 | select CPU_S3C2442 | 25 | select CPU_S3C2442 |
26 | 26 | ||
27 | config MACH_NEO1973_GTA02 | ||
28 | bool "Openmoko GTA02 / Freerunner phone" | ||
29 | select CPU_S3C2442 | ||
30 | select MFD_PCF50633 | ||
31 | select PCF50633_GPIO | ||
32 | select I2C | ||
33 | select POWER_SUPPLY | ||
34 | select MACH_NEO1973 | ||
35 | select S3C2410_PWM | ||
36 | help | ||
37 | Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone | ||
38 | |||
27 | 39 | ||
28 | endmenu | 40 | endmenu |
29 | 41 | ||