diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-13 10:41:01 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-13 10:41:01 -0400 |
| commit | 78890b5989d96ddce989cde929c45ceeded0fcaf (patch) | |
| tree | 4e2da81fc7c97f11aee174b1eedac110c9a68b3a /arch/arm/mach-s3c24xx/Kconfig | |
| parent | 1959ec5f82acbdf91425b41600f119ebecb5f6a8 (diff) | |
| parent | 55d512e245bc7699a8800e23df1a24195dd08217 (diff) | |
Merge commit 'v3.6-rc5' into next
* commit 'v3.6-rc5': (1098 commits)
Linux 3.6-rc5
HID: tpkbd: work even if the new Lenovo Keyboard driver is not configured
Remove user-triggerable BUG from mpol_to_str
xen/pciback: Fix proper FLR steps.
uml: fix compile error in deliver_alarm()
dj: memory scribble in logi_dj
Fix order of arguments to compat_put_time[spec|val]
xen: Use correct masking in xen_swiotlb_alloc_coherent.
xen: fix logical error in tlb flushing
xen/p2m: Fix one-off error in checking the P2M tree directory.
powerpc: Don't use __put_user() in patch_instruction
powerpc: Make sure IPI handlers see data written by IPI senders
powerpc: Restore correct DSCR in context switch
powerpc: Fix DSCR inheritance in copy_thread()
powerpc: Keep thread.dscr and thread.dscr_inherit in sync
powerpc: Update DSCR on all CPUs when writing sysfs dscr_default
powerpc/powernv: Always go into nap mode when CPU is offline
powerpc: Give hypervisor decrementer interrupts their own handler
powerpc/vphn: Fix arch_update_cpu_topology() return value
ARM: gemini: fix the gemini build
...
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/rapidio/devices/tsi721.c
Diffstat (limited to 'arch/arm/mach-s3c24xx/Kconfig')
| -rw-r--r-- | arch/arm/mach-s3c24xx/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index e24961109b70..d56b0f7f2b20 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig | |||
| @@ -483,7 +483,7 @@ config MACH_NEO1973_GTA02 | |||
| 483 | select I2C | 483 | select I2C |
| 484 | select POWER_SUPPLY | 484 | select POWER_SUPPLY |
| 485 | select MACH_NEO1973 | 485 | select MACH_NEO1973 |
| 486 | select S3C2410_PWM | 486 | select S3C24XX_PWM |
| 487 | select S3C_DEV_USB_HOST | 487 | select S3C_DEV_USB_HOST |
| 488 | help | 488 | help |
| 489 | Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone | 489 | Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone |
| @@ -493,7 +493,7 @@ config MACH_RX1950 | |||
| 493 | select S3C24XX_DCLK | 493 | select S3C24XX_DCLK |
| 494 | select PM_H1940 if PM | 494 | select PM_H1940 if PM |
| 495 | select I2C | 495 | select I2C |
| 496 | select S3C2410_PWM | 496 | select S3C24XX_PWM |
| 497 | select S3C_DEV_NAND | 497 | select S3C_DEV_NAND |
| 498 | select S3C2410_IOTIMING if S3C2440_CPUFREQ | 498 | select S3C2410_IOTIMING if S3C2440_CPUFREQ |
| 499 | select S3C2440_XTAL_16934400 | 499 | select S3C2440_XTAL_16934400 |