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
/
maltaup_xpa_defconfig
diff --git
a/arch/mips/configs/maltaup_xpa_defconfig
b/arch/mips/configs/maltaup_xpa_defconfig
index 4e50176cb3df53e65c06fc00355b359ed0216a20..99a19cf5f9ba8af6feb873d862d14e2459d1db36 100644
(file)
--- a/
arch/mips/configs/maltaup_xpa_defconfig
+++ b/
arch/mips/configs/maltaup_xpa_defconfig
@@
-326,6
+326,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