The patch titled bluetooth: fix build warnings on defconfigs has been removed from the -mm tree. Its filename was bluetooth-fix-build-warnings-on-defconfigs.patch This patch was dropped because other changes were merged, which wrecked this patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: bluetooth: fix build warnings on defconfigs From: Wanlong Gao <wanlong.gao@xxxxxxxxx> Change the BT_L2CAP and BT_SCO defconfigs from 'm' to 'y', since BT_L2CAP and BT_SCO had changed to bool configs. Signed-off-by: Wanlong Gao <wanlong.gao@xxxxxxxxx> Acked-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> Cc: Marcel Holtmann <marcel@xxxxxxxxxxxx> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> Acked-by: Igor Grinberg <grinberg@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/arm/configs/am200epdkit_defconfig | 4 ++-- arch/arm/configs/at572d940hfek_defconfig | 2 +- arch/arm/configs/at91rm9200_defconfig | 4 ++-- arch/arm/configs/badge4_defconfig | 2 +- arch/arm/configs/cm_x2xx_defconfig | 4 ++-- arch/arm/configs/cm_x300_defconfig | 4 ++-- arch/arm/configs/colibri_pxa270_defconfig | 4 ++-- arch/arm/configs/corgi_defconfig | 4 ++-- arch/arm/configs/davinci_all_defconfig | 2 +- arch/arm/configs/em_x270_defconfig | 4 ++-- arch/arm/configs/magician_defconfig | 4 ++-- arch/arm/configs/mini2440_defconfig | 4 ++-- arch/arm/configs/nhk8815_defconfig | 4 ++-- arch/arm/configs/ns9xxx_defconfig | 2 +- arch/arm/configs/omap2plus_defconfig | 4 ++-- arch/arm/configs/pxa3xx_defconfig | 2 +- arch/arm/configs/s3c2410_defconfig | 6 +++--- arch/arm/configs/simpad_defconfig | 4 ++-- arch/arm/configs/spitz_defconfig | 4 ++-- arch/arm/configs/trizeps4_defconfig | 4 ++-- arch/arm/configs/viper_defconfig | 2 +- arch/arm/configs/zeus_defconfig | 4 ++-- arch/avr32/configs/atngw100_mrmt_defconfig | 2 +- arch/mips/configs/lemote2f_defconfig | 4 ++-- arch/mips/configs/mtx1_defconfig | 4 ++-- arch/powerpc/configs/c2k_defconfig | 4 ++-- arch/powerpc/configs/pmac32_defconfig | 4 ++-- arch/powerpc/configs/ppc6xx_defconfig | 4 ++-- arch/powerpc/configs/ps3_defconfig | 4 ++-- 29 files changed, 52 insertions(+), 52 deletions(-) diff -puN arch/arm/configs/am200epdkit_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/am200epdkit_defconfig --- a/arch/arm/configs/am200epdkit_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/am200epdkit_defconfig @@ -34,8 +34,8 @@ CONFIG_INET=y # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set 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 diff -puN arch/arm/configs/at572d940hfek_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/at572d940hfek_defconfig --- a/arch/arm/configs/at572d940hfek_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/at572d940hfek_defconfig @@ -280,7 +280,7 @@ CONFIG_SDIO_UART=m CONFIG_MMC_AT91=m CONFIG_MMC_SPI=m CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=m CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m diff -puN arch/arm/configs/at91rm9200_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/at91rm9200_defconfig --- a/arch/arm/configs/at91rm9200_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/at91rm9200_defconfig @@ -75,8 +75,8 @@ CONFIG_IPV6_TUNNEL=m CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=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 diff -puN arch/arm/configs/badge4_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/badge4_defconfig --- a/arch/arm/configs/badge4_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/badge4_defconfig @@ -24,7 +24,7 @@ CONFIG_IRCOMM=y CONFIG_IRDA_ULTRA=y CONFIG_SA1100_FIR=y CONFIG_BT=m -CONFIG_BT_L2CAP=m +CONFIG_BT_L2CAP=y CONFIG_BT_HCIUART=m CONFIG_BT_HCIVHCI=m # CONFIG_FW_LOADER is not set diff -puN arch/arm/configs/cm_x2xx_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/cm_x2xx_defconfig --- a/arch/arm/configs/cm_x2xx_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/cm_x2xx_defconfig @@ -43,8 +43,8 @@ CONFIG_IP_PNP_BOOTP=y # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set 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_BNEP=m CONFIG_BT_HIDP=m diff -puN arch/arm/configs/cm_x300_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/cm_x300_defconfig --- a/arch/arm/configs/cm_x300_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/cm_x300_defconfig @@ -40,8 +40,8 @@ CONFIG_IP_PNP_RARP=y # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set 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 diff -puN arch/arm/configs/colibri_pxa270_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/colibri_pxa270_defconfig --- a/arch/arm/configs/colibri_pxa270_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/colibri_pxa270_defconfig @@ -45,8 +45,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 diff -puN arch/arm/configs/corgi_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/corgi_defconfig --- a/arch/arm/configs/corgi_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/corgi_defconfig @@ -69,8 +69,8 @@ CONFIG_IRNET=m CONFIG_IRCOMM=m CONFIG_PXA_FICP=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 diff -puN arch/arm/configs/davinci_all_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/davinci_all_defconfig --- a/arch/arm/configs/davinci_all_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/davinci_all_defconfig @@ -152,7 +152,7 @@ CONFIG_MMC=m # CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_DAVINCI=m CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=m CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m diff -puN arch/arm/configs/em_x270_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/em_x270_defconfig --- a/arch/arm/configs/em_x270_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/em_x270_defconfig @@ -38,8 +38,8 @@ CONFIG_IP_PNP_BOOTP=y # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set 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_BNEP=m CONFIG_BT_HIDP=m diff -puN arch/arm/configs/magician_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/magician_defconfig --- a/arch/arm/configs/magician_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/magician_defconfig @@ -48,8 +48,8 @@ CONFIG_IRDA_DEBUG=y CONFIG_IRTTY_SIR=m CONFIG_PXA_FICP=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 diff -puN arch/arm/configs/mini2440_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/mini2440_defconfig --- a/arch/arm/configs/mini2440_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/mini2440_defconfig @@ -56,8 +56,8 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_NET_PKTGEN=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 diff -puN arch/arm/configs/nhk8815_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/nhk8815_defconfig --- a/arch/arm/configs/nhk8815_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/nhk8815_defconfig @@ -38,8 +38,8 @@ CONFIG_IP_MROUTE=y # CONFIG_INET_LRO is not set # CONFIG_IPV6 is not set 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 diff -puN arch/arm/configs/ns9xxx_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/ns9xxx_defconfig --- a/arch/arm/configs/ns9xxx_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/ns9xxx_defconfig @@ -38,7 +38,7 @@ CONFIG_I2C_GPIO=m # CONFIG_VGA_CONSOLE is not set # CONFIG_USB_SUPPORT is not set CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=m CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m diff -puN arch/arm/configs/omap2plus_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/omap2plus_defconfig --- a/arch/arm/configs/omap2plus_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/omap2plus_defconfig @@ -89,8 +89,8 @@ CONFIG_IP_PNP_RARP=y # CONFIG_IPV6 is not set CONFIG_NETFILTER=y CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m +CONFIG_BT_L2CAP=y +CONFIG_BT_SCO=y CONFIG_BT_RFCOMM=y CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m diff -puN arch/arm/configs/pxa3xx_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/pxa3xx_defconfig --- a/arch/arm/configs/pxa3xx_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/pxa3xx_defconfig @@ -99,7 +99,7 @@ CONFIG_LOGO=y CONFIG_MMC=y CONFIG_MMC_PXA=y CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=m CONFIG_LEDS_DA903X=m CONFIG_LEDS_TRIGGERS=y diff -puN arch/arm/configs/s3c2410_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/s3c2410_defconfig --- a/arch/arm/configs/s3c2410_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/s3c2410_defconfig @@ -177,8 +177,8 @@ CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=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 @@ -387,7 +387,7 @@ CONFIG_MMC_TEST=m CONFIG_MMC_SDHCI=m CONFIG_MMC_SPI=m CONFIG_MMC_S3C=y -CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS=y CONFIG_LEDS_S3C24XX=m CONFIG_LEDS_H1940=m CONFIG_LEDS_PCA9532=m diff -puN arch/arm/configs/simpad_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/simpad_defconfig --- a/arch/arm/configs/simpad_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/simpad_defconfig @@ -33,8 +33,8 @@ CONFIG_IRCOMM=m CONFIG_IRTTY_SIR=m CONFIG_SA1100_FIR=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 diff -puN arch/arm/configs/spitz_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/spitz_defconfig --- a/arch/arm/configs/spitz_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/spitz_defconfig @@ -66,8 +66,8 @@ CONFIG_IRNET=m CONFIG_IRCOMM=m CONFIG_PXA_FICP=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 diff -puN arch/arm/configs/trizeps4_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/trizeps4_defconfig --- a/arch/arm/configs/trizeps4_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/trizeps4_defconfig @@ -49,8 +49,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 diff -puN arch/arm/configs/viper_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/viper_defconfig --- a/arch/arm/configs/viper_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/viper_defconfig @@ -37,7 +37,7 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET_LRO is not set # CONFIG_IPV6 is not set CONFIG_BT=m -CONFIG_BT_L2CAP=m +CONFIG_BT_L2CAP=y CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m diff -puN arch/arm/configs/zeus_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/arm/configs/zeus_defconfig --- a/arch/arm/configs/zeus_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/arm/configs/zeus_defconfig @@ -32,7 +32,7 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET_LRO is not set # CONFIG_IPV6 is not set CONFIG_BT=m -CONFIG_BT_L2CAP=m +CONFIG_BT_L2CAP=y CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m @@ -150,7 +150,7 @@ CONFIG_MMC=y # CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_PXA=y CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=m CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m diff -puN arch/avr32/configs/atngw100_mrmt_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/avr32/configs/atngw100_mrmt_defconfig --- a/arch/avr32/configs/atngw100_mrmt_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/avr32/configs/atngw100_mrmt_defconfig @@ -36,7 +36,7 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET_LRO is not set # CONFIG_IPV6 is not set CONFIG_BT=m -CONFIG_BT_L2CAP=m +CONFIG_BT_L2CAP=y CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_HIDP=m diff -puN arch/mips/configs/lemote2f_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/mips/configs/lemote2f_defconfig --- a/arch/mips/configs/lemote2f_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/mips/configs/lemote2f_defconfig @@ -86,8 +86,8 @@ CONFIG_NET_SCHED=y CONFIG_NET_EMATCH=y CONFIG_NET_CLS_ACT=y 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 diff -puN arch/mips/configs/mtx1_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/mips/configs/mtx1_defconfig --- a/arch/mips/configs/mtx1_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/mips/configs/mtx1_defconfig @@ -225,8 +225,8 @@ CONFIG_TOSHIBA_FIR=m CONFIG_VLSI_FIR=m CONFIG_MCS_FIR=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 diff -puN arch/powerpc/configs/c2k_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/powerpc/configs/c2k_defconfig --- a/arch/powerpc/configs/c2k_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/powerpc/configs/c2k_defconfig @@ -132,8 +132,8 @@ CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_IND=y 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 diff -puN arch/powerpc/configs/pmac32_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/powerpc/configs/pmac32_defconfig --- a/arch/powerpc/configs/pmac32_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/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 diff -puN arch/powerpc/configs/ppc6xx_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/powerpc/configs/ppc6xx_defconfig --- a/arch/powerpc/configs/ppc6xx_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/powerpc/configs/ppc6xx_defconfig @@ -351,8 +351,8 @@ CONFIG_VLSI_FIR=m CONFIG_VIA_FIR=m CONFIG_MCS_FIR=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 diff -puN arch/powerpc/configs/ps3_defconfig~bluetooth-fix-build-warnings-on-defconfigs arch/powerpc/configs/ps3_defconfig --- a/arch/powerpc/configs/ps3_defconfig~bluetooth-fix-build-warnings-on-defconfigs +++ a/arch/powerpc/configs/ps3_defconfig @@ -52,8 +52,8 @@ CONFIG_IP_PNP_DHCP=y # CONFIG_INET_DIAG is not set CONFIG_IPV6=y 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 _ Patches currently in -mm which might be from wanlong.gao@xxxxxxxxx are linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html