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 branch 'for-linus' of git://neil.brown.name/md
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
configs
/
pseries_defconfig
diff --git
a/arch/powerpc/configs/pseries_defconfig
b/arch/powerpc/configs/pseries_defconfig
index adaa05fb0478f7bce0b540eee7374e282f601f6c..fe6ffa683d781d2c818b42df92dd275859c5c3d4 100644
(file)
--- a/
arch/powerpc/configs/pseries_defconfig
+++ b/
arch/powerpc/configs/pseries_defconfig
@@
-946,6
+946,7
@@
CONFIG_HVC_DRIVER=y
CONFIG_HVC_CONSOLE=y
CONFIG_HVC_RTAS=y
CONFIG_HVCS=m
+CONFIG_IBM_BSR=m
# CONFIG_IPMI_HANDLER is not set
# CONFIG_HW_RANDOM is not set
CONFIG_GEN_RTC=y