diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 08:49:18 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 08:49:18 -0400 |
| commit | d61bd77ff1e7c7a0a381c6e656dbc07b37510f37 (patch) | |
| tree | 838f7b1c4d931814fbbc30643bb423f409e6daba /arch/arm/Kconfig | |
| parent | f2b7e3c54a304677a1142829fb5913595885379f (diff) | |
| parent | 1c739c7f374f77c5a355273c0c1d9345ed08c0ce (diff) | |
Merge branch 'next-samsung' into for-next
Conflicts:
arch/arm/mach-s5p6440/Kconfig
arch/arm/mach-s5p6442/Kconfig
arch/arm/mach-s5pc100/Kconfig
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/cpu.c
arch/arm/plat-samsung/include/plat/sdhci.h
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3e68a93ce71..c797a8b4d8c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -634,6 +634,7 @@ config ARCH_S3C2410 | |||
| 634 | select ARCH_HAS_CPUFREQ | 634 | select ARCH_HAS_CPUFREQ |
| 635 | select HAVE_CLK | 635 | select HAVE_CLK |
| 636 | select ARCH_USES_GETTIMEOFFSET | 636 | select ARCH_USES_GETTIMEOFFSET |
| 637 | select HAVE_S3C2410_I2C | ||
| 637 | help | 638 | help |
| 638 | Samsung S3C2410X CPU based systems, such as the Simtec Electronics | 639 | Samsung S3C2410X CPU based systems, such as the Simtec Electronics |
| 639 | BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or | 640 | BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or |
| @@ -663,6 +664,8 @@ config ARCH_S3C64XX | |||
| 663 | select S3C_DEV_NAND | 664 | select S3C_DEV_NAND |
| 664 | select USB_ARCH_HAS_OHCI | 665 | select USB_ARCH_HAS_OHCI |
| 665 | select SAMSUNG_GPIOLIB_4BIT | 666 | select SAMSUNG_GPIOLIB_4BIT |
| 667 | select HAVE_S3C2410_I2C | ||
| 668 | select HAVE_S3C2410_WATCHDOG | ||
| 666 | help | 669 | help |
| 667 | Samsung S3C64XX series based systems | 670 | Samsung S3C64XX series based systems |
| 668 | 671 | ||
| @@ -671,7 +674,10 @@ config ARCH_S5P6440 | |||
| 671 | select CPU_V6 | 674 | select CPU_V6 |
| 672 | select GENERIC_GPIO | 675 | select GENERIC_GPIO |
| 673 | select HAVE_CLK | 676 | select HAVE_CLK |
| 677 | select HAVE_S3C2410_WATCHDOG | ||
| 674 | select ARCH_USES_GETTIMEOFFSET | 678 | select ARCH_USES_GETTIMEOFFSET |
| 679 | select HAVE_S3C2410_I2C | ||
| 680 | select HAVE_S3C_RTC | ||
| 675 | help | 681 | help |
| 676 | Samsung S5P6440 CPU based systems | 682 | Samsung S5P6440 CPU based systems |
| 677 | 683 | ||
| @@ -681,6 +687,7 @@ config ARCH_S5P6442 | |||
| 681 | select GENERIC_GPIO | 687 | select GENERIC_GPIO |
| 682 | select HAVE_CLK | 688 | select HAVE_CLK |
| 683 | select ARCH_USES_GETTIMEOFFSET | 689 | select ARCH_USES_GETTIMEOFFSET |
| 690 | select HAVE_S3C2410_WATCHDOG | ||
| 684 | help | 691 | help |
| 685 | Samsung S5P6442 CPU based systems | 692 | Samsung S5P6442 CPU based systems |
| 686 | 693 | ||
| @@ -691,6 +698,9 @@ config ARCH_S5PC100 | |||
| 691 | select CPU_V7 | 698 | select CPU_V7 |
| 692 | select ARM_L1_CACHE_SHIFT_6 | 699 | select ARM_L1_CACHE_SHIFT_6 |
| 693 | select ARCH_USES_GETTIMEOFFSET | 700 | select ARCH_USES_GETTIMEOFFSET |
| 701 | select HAVE_S3C2410_I2C | ||
| 702 | select HAVE_S3C_RTC | ||
| 703 | select HAVE_S3C2410_WATCHDOG | ||
| 694 | help | 704 | help |
| 695 | Samsung S5PC100 series based systems | 705 | Samsung S5PC100 series based systems |
| 696 | 706 | ||
| @@ -701,6 +711,9 @@ config ARCH_S5PV210 | |||
| 701 | select HAVE_CLK | 711 | select HAVE_CLK |
| 702 | select ARM_L1_CACHE_SHIFT_6 | 712 | select ARM_L1_CACHE_SHIFT_6 |
| 703 | select ARCH_USES_GETTIMEOFFSET | 713 | select ARCH_USES_GETTIMEOFFSET |
| 714 | select HAVE_S3C2410_I2C | ||
| 715 | select HAVE_S3C_RTC | ||
| 716 | select HAVE_S3C2410_WATCHDOG | ||
| 704 | help | 717 | help |
| 705 | Samsung S5PV210/S5PC110 series based systems | 718 | Samsung S5PV210/S5PC110 series based systems |
| 706 | 719 | ||