mach-tegra: tegra[3,11]: bluesleep as built-in or module
Mursalin Akon [Thu, 24 Jan 2013 22:19:22 +0000 (14:19 -0800)]
allow bluesleep as built-in or module

Bug 1219372

Change-Id: I2815783c38291c5493e0448cd1a0f9e3bc0daf2d
Signed-off-by: Mursalin Akon <makon@nvidia.com>
Reviewed-on: http://git-master/r/193946
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Allen Martin <amartin@nvidia.com>

arch/arm/mach-tegra/board-cardhu.c
arch/arm/mach-tegra/board-dalmore.c

index cb137f8..dd8e312 100644 (file)
@@ -83,7 +83,7 @@
 #include "wdt-recovery.h"
 #include "common.h"
 
-#ifdef CONFIG_BT_BLUESLEEP
+#if defined(CONFIG_BT_BLUESLEEP) || defined(CONFIG_BT_BLUESLEEP_MODULE)
 static struct rfkill_gpio_platform_data cardhu_bt_rfkill_pdata[] = {
        {
                .name           = "bt_rfkill",
@@ -781,7 +781,7 @@ static struct platform_device *cardhu_devices[] __initdata = {
        &spdif_dit_device,
        &bluetooth_dit_device,
        &baseband_dit_device,
-#ifdef CONFIG_BT_BLUESLEEP
+#if defined(CONFIG_BT_BLUESLEEP) || defined(CONFIG_BT_BLUESLEEP_MODULE)
        &cardhu_bt_rfkill_device,
 #endif
        &tegra_pcm_device,
@@ -1372,7 +1372,7 @@ static void __init tegra_cardhu_init(void)
        cardhu_panel_init();
        cardhu_pmon_init();
        cardhu_sensors_init();
-#ifdef CONFIG_BT_BLUESLEEP
+#if defined(CONFIG_BT_BLUESLEEP) || defined(CONFIG_BT_BLUESLEEP_MODULE)
        cardhu_setup_bluesleep();
 #elif defined CONFIG_BLUEDROID_PM
        cardhu_setup_bluedroid_pm();
index f5d853c..943e042 100644 (file)
@@ -80,7 +80,7 @@
 #include "common.h"
 #include "tegra-board-id.h"
 
-#ifdef CONFIG_BT_BLUESLEEP
+#if defined(CONFIG_BT_BLUESLEEP) || defined(CONFIG_BT_BLUESLEEP_MODULE)
 static struct rfkill_gpio_platform_data dalmore_bt_rfkill_pdata = {
                .name           = "bt_rfkill",
                .shutdown_gpio  = TEGRA_GPIO_PQ7,
@@ -798,7 +798,7 @@ static void __init tegra_dalmore_init(void)
                dalmore_panel_init();
        dalmore_kbc_init();
        dalmore_pmon_init();
-#ifdef CONFIG_BT_BLUESLEEP
+#if defined(CONFIG_BT_BLUESLEEP) || defined(CONFIG_BT_BLUESLEEP_MODULE)
        dalmore_setup_bluesleep();
        dalmore_setup_bt_rfkill();
 #elif defined CONFIG_BLUEDROID_PM