projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
[platform/kernel/linux-rpi.git]
/
arch
/
arm
/
configs
/
mini2440_defconfig
diff --git
a/arch/arm/configs/mini2440_defconfig
b/arch/arm/configs/mini2440_defconfig
index
8b0f7c4
..
7d26ca0
100644
(file)
--- a/
arch/arm/configs/mini2440_defconfig
+++ b/
arch/arm/configs/mini2440_defconfig
@@
-152,7
+152,7
@@
CONFIG_SPI_S3C24XX=y
CONFIG_SPI_SPIDEV=y
CONFIG_GPIO_SYSFS=y
CONFIG_SENSORS_LM75=y
-CONFIG_THERMAL=
m
+CONFIG_THERMAL=
y
CONFIG_WATCHDOG=y
CONFIG_S3C2410_WATCHDOG=y
CONFIG_FB=y