git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
arch
/
powerpc
/
configs
/
pmac32_defconfig
diff --git
a/arch/powerpc/configs/pmac32_defconfig
b/arch/powerpc/configs/pmac32_defconfig
index
ac4fc41
..
f8b394a
100644
(file)
--- a/
arch/powerpc/configs/pmac32_defconfig
+++ b/
arch/powerpc/configs/pmac32_defconfig
@@
-112,8
+112,8
@@
CONFIG_IRDA_CACHE_LAST_LSAP=y
CONFIG_IRDA_FAST_RR=y
CONFIG_IRTTY_SIR=m
CONFIG_BT=m
-CONFIG_BT_L2CAP=
m
-CONFIG_BT_SCO=
m
+CONFIG_BT_L2CAP=
y
+CONFIG_BT_SCO=
y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m