git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
configs
/
malta_defconfig
diff --git
a/arch/mips/configs/malta_defconfig
b/arch/mips/configs/malta_defconfig
index df8a9a15ca83a71ed80a792c7655334601902335..81058295d35f53905fe5ca3ae2c0dbe24c2a28d0 100644
(file)
--- a/
arch/mips/configs/malta_defconfig
+++ b/
arch/mips/configs/malta_defconfig
@@
-317,6
+317,7
@@
CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_PIIX4_POWEROFF=y
CONFIG_POWER_RESET_SYSCON=y
# CONFIG_HWMON is not set
CONFIG_FB=y