diff options
| author | Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com> | 2011-09-07 18:05:58 +0530 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 16:07:24 +0200 |
| commit | aa8e4eb9da7c51aca1cc7e85e5db7ff0a500a7f5 (patch) | |
| tree | 58c032ca3f6c6b76a6c4e05d45c9b1e95d97bbfe /arch | |
| parent | 2999966b3b85fc0cfd732b4fdf6f7cecbecb8da8 (diff) | |
Revert "cg2900: bluetooth support for 5500"
This reverts commit 76d004cce0dbb6fddad256790e6ae574278b46e0.
Conflicts:
arch/arm/mach-ux500/board-u5500.c
drivers/staging/cg2900/devices-cg2900-u8500.c
drivers/staging/cg2900/devices-cg2900.h
Change-Id: Ic480f348be5387d83a3e46280b73dd9bbb3ba43d
Signed-off-by: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30347
Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c index b993aa8e449..15f53543461 100644 --- a/arch/arm/mach-ux500/board-u5500.c +++ b/arch/arm/mach-ux500/board-u5500.c @@ -520,7 +520,6 @@ static void __init u5500_uart_init(void) db5500_add_uart0(NULL); db5500_add_uart1(NULL); db5500_add_uart2(NULL); - db5500_add_uart3(NULL); } static void __init u5500_init_machine(void) |