diff options
| author | Mursalin Akon <makon@nvidia.com> | 2013-01-24 14:19:22 -0800 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2013-01-28 11:53:28 -0800 |
| commit | 22cfd76a4b6ab8340d7634c10100eb1c59258125 (patch) | |
| tree | ccf5b02578224262d4ad2f4dfcdbcf6741ad4cc5 /arch/arm/mach-tegra/board-cardhu.c | |
| parent | 6a06327605c32185ba5e365f07ff64142ffbd59b (diff) | |
mach-tegra: tegra[3,11]: bluesleep as built-in or module
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>
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index cb137f8931c1..dd8e312a20d6 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -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(); |