diff options
| author | Olof Johansson <olof@lixom.net> | 2016-02-25 01:18:08 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-02-25 01:18:08 +0300 |
| commit | 5dc1104960f634445b2296c865b1d091a495bcef (patch) | |
| tree | 1fdbd8d962d1fc8ee24c747c59b80a82b5df74cf /arch/arm/configs | |
| parent | 388f7b1d6e8ca06762e2454d28d6c3c55ad0fe95 (diff) | |
| parent | dc7eb9d589e595954792cc192bcbb92932e5c2ff (diff) | |
| download | linux-5dc1104960f634445b2296c865b1d091a495bcef.tar.xz | |
Merge tag 'samsung-fixes-non-critical-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/fixes-non-critical
Fixes from Arnd for harmless warnings for Exynos and S3C platforms.
* tag 'samsung-fixes-non-critical-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: EXYNOS: select THERMAL_OF
ARM: s3c64xx: mark regulator init data as unused
ARM: s3c24xx: fix unused gta02_configure_pmu_for_charger warning
ARM: s3c24xx: allow selecting S3C2440_XTAL_16934400 for s3c2442
ARM: s3c24xx: don't select EEPROM_AT24
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/mini2440_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/s3c2410_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig index 9c93f5655248..0b02e4f43c6a 100644 --- a/arch/arm/configs/mini2440_defconfig +++ b/arch/arm/configs/mini2440_defconfig @@ -158,6 +158,7 @@ CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_S3C2410=y CONFIG_I2C_SIMTEC=y +CONFIG_EEPROM_AT24=y CONFIG_SPI=y CONFIG_SPI_S3C24XX=y CONFIG_SPI_SPIDEV=y diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index f3142369f594..b3ade552a2a5 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig @@ -290,6 +290,7 @@ CONFIG_HW_RANDOM=y CONFIG_I2C_CHARDEV=m CONFIG_I2C_S3C2410=y CONFIG_I2C_SIMTEC=y +CONFIG_EEPROM_AT24=y CONFIG_SPI=y CONFIG_SPI_GPIO=m CONFIG_SPI_S3C24XX=m |