diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2013-01-18 23:14:41 +0000 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.org> | 2013-01-20 09:50:31 +0000 |
| commit | 10b2523bd76efada8f212f55b5b36889091b991a (patch) | |
| tree | fda4be91de7619b05ea8fa47c3c83d2dae22319a /arch | |
| parent | 4c4e63a4c4f6c0e862e892ff2925adac8de3b2b4 (diff) | |
| download | kernel_samsung_smdk4412-10b2523bd76efada8f212f55b5b36889091b991a.tar.gz kernel_samsung_smdk4412-10b2523bd76efada8f212f55b5b36889091b991a.tar.bz2 kernel_samsung_smdk4412-10b2523bd76efada8f212f55b5b36889091b991a.zip | |
t0lte: add wake_peer and bcm header back
Change-Id: Id2935767a5aa83b75d19963ad538fa8623160852
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-exynos/Kconfig.local | 1 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/mach-midas.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/Kconfig.local b/arch/arm/mach-exynos/Kconfig.local index e653df67588..9630ab1da28 100644 --- a/arch/arm/mach-exynos/Kconfig.local +++ b/arch/arm/mach-exynos/Kconfig.local @@ -93,6 +93,7 @@ config MACH_T0_USA_VZW config MACH_T0_USA_SPR bool "SPR" + select MACH_T0_LTE config MACH_T0_USA_USCC bool "USCC" diff --git a/arch/arm/mach-exynos/mach-midas.c b/arch/arm/mach-exynos/mach-midas.c index 2073d698d7c..466cc2cfae6 100644 --- a/arch/arm/mach-exynos/mach-midas.c +++ b/arch/arm/mach-exynos/mach-midas.c @@ -44,7 +44,7 @@ #include <linux/power/max8922_charger_u1.h> #endif -#if defined(CONFIG_BT_BCM4334) && !defined(CONFIG_MACH_T0_LTE) +#if defined(CONFIG_BT_BCM4334) && !defined(MACH_T0_USA_VZW) && !defined(MACH_T0_USA_SPR) #include <mach/board-bluetooth-bcm.h> #endif @@ -193,7 +193,7 @@ static struct s3c2410_uartcfg smdk4212_uartcfgs[] __initdata = { .ucon = SMDK4212_UCON_DEFAULT, .ulcon = SMDK4212_ULCON_DEFAULT, .ufcon = SMDK4212_UFCON_DEFAULT, -#if defined(CONFIG_BT_BCM4334) && !defined(CONFIG_MACH_T0_LTE) +#if defined(CONFIG_BT_BCM4334) && !defined(MACH_T0_USA_VZW) && !defined(MACH_T0_USA_SPR) .wake_peer = bcm_bt_lpm_exit_lpm_locked, #endif }, |