tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: Fix HAVE_S3C_RTC warnings
ARM: SAMSUNG: Fix HAVE_S3C2410_I2C warnings
ARM: SAMSUNG: Fix HAVE_S3C2410_WATCHDOG warnings

Linus Torvalds f187a451 70231669

+17 -17
+16 -16
arch/arm/Kconfig
··· 646 646 select ARCH_HAS_CPUFREQ 647 647 select HAVE_CLK 648 648 select ARCH_USES_GETTIMEOFFSET 649 - select HAVE_S3C2410_I2C 649 + select HAVE_S3C2410_I2C if I2C 650 650 help 651 651 Samsung S3C2410X CPU based systems, such as the Simtec Electronics 652 652 BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or ··· 676 676 select S3C_DEV_NAND 677 677 select USB_ARCH_HAS_OHCI 678 678 select SAMSUNG_GPIOLIB_4BIT 679 - select HAVE_S3C2410_I2C 680 - select HAVE_S3C2410_WATCHDOG 679 + select HAVE_S3C2410_I2C if I2C 680 + select HAVE_S3C2410_WATCHDOG if WATCHDOG 681 681 help 682 682 Samsung S3C64XX series based systems 683 683 ··· 686 686 select CPU_V6 687 687 select GENERIC_GPIO 688 688 select HAVE_CLK 689 - select HAVE_S3C2410_WATCHDOG 689 + select HAVE_S3C2410_WATCHDOG if WATCHDOG 690 690 select ARCH_USES_GETTIMEOFFSET 691 - select HAVE_S3C2410_I2C 692 - select HAVE_S3C_RTC 691 + select HAVE_S3C2410_I2C if I2C 692 + select HAVE_S3C_RTC if RTC_CLASS 693 693 help 694 694 Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440, 695 695 SMDK6450. ··· 700 700 select GENERIC_GPIO 701 701 select HAVE_CLK 702 702 select ARCH_USES_GETTIMEOFFSET 703 - select HAVE_S3C2410_WATCHDOG 703 + select HAVE_S3C2410_WATCHDOG if WATCHDOG 704 704 help 705 705 Samsung S5P6442 CPU based systems 706 706 ··· 711 711 select CPU_V7 712 712 select ARM_L1_CACHE_SHIFT_6 713 713 select ARCH_USES_GETTIMEOFFSET 714 - select HAVE_S3C2410_I2C 715 - select HAVE_S3C_RTC 716 - select HAVE_S3C2410_WATCHDOG 714 + select HAVE_S3C2410_I2C if I2C 715 + select HAVE_S3C_RTC if RTC_CLASS 716 + select HAVE_S3C2410_WATCHDOG if WATCHDOG 717 717 help 718 718 Samsung S5PC100 series based systems 719 719 ··· 726 726 select ARM_L1_CACHE_SHIFT_6 727 727 select ARCH_HAS_CPUFREQ 728 728 select ARCH_USES_GETTIMEOFFSET 729 - select HAVE_S3C2410_I2C 730 - select HAVE_S3C_RTC 731 - select HAVE_S3C2410_WATCHDOG 729 + select HAVE_S3C2410_I2C if I2C 730 + select HAVE_S3C_RTC if RTC_CLASS 731 + select HAVE_S3C2410_WATCHDOG if WATCHDOG 732 732 help 733 733 Samsung S5PV210/S5PC110 series based systems 734 734 ··· 739 739 select GENERIC_GPIO 740 740 select HAVE_CLK 741 741 select GENERIC_CLOCKEVENTS 742 - select HAVE_S3C_RTC 743 - select HAVE_S3C2410_I2C 744 - select HAVE_S3C2410_WATCHDOG 742 + select HAVE_S3C_RTC if RTC_CLASS 743 + select HAVE_S3C2410_I2C if I2C 744 + select HAVE_S3C2410_WATCHDOG if WATCHDOG 745 745 help 746 746 Samsung S5PV310 series based systems 747 747
+1 -1
arch/arm/mach-s3c64xx/Kconfig
··· 143 143 select S3C_DEV_USB_HSOTG 144 144 select S3C_DEV_WDT 145 145 select SAMSUNG_DEV_KEYPAD 146 - select HAVE_S3C2410_WATCHDOG 146 + select HAVE_S3C2410_WATCHDOG if WATCHDOG 147 147 select S3C64XX_SETUP_SDHCI 148 148 select S3C64XX_SETUP_I2C1 149 149 select S3C64XX_SETUP_IDE