diff options
| author | Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com> | 2011-09-07 18:05:58 +0530 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 12:55:56 +0200 |
| commit | ce21cb62263b2252c637a8c4728eaab47aae112f (patch) | |
| tree | 0480ead8fe471ad689aff045fd4cb6c631310fa2 /drivers/staging/cg2900/Makefile | |
| parent | 6a0873c713b7c9fb5dacdf6349c631f21b2c0c1f (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 'drivers/staging/cg2900/Makefile')
| -rw-r--r-- | drivers/staging/cg2900/Makefile | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/cg2900/Makefile b/drivers/staging/cg2900/Makefile index 0e76f4bf5bd..c6414c21c5d 100644 --- a/drivers/staging/cg2900/Makefile +++ b/drivers/staging/cg2900/Makefile @@ -6,15 +6,7 @@ ccflags-y := \ -Idrivers/staging/cg2900/include \ -Iarch/arm/mach-ux500 -obj-$(CONFIG_CG2900) += devices-cg2900.o -ifeq ($(CONFIG_UX500_SOC_DB8500), y) -obj-$(CONFIG_CG2900) += devices-cg2900-u8500.o -obj-$(CONFIG_CG2900) += board-mop500-cg2900.o -endif -ifeq ($(CONFIG_UX500_SOC_DB5500), y) -obj-$(CONFIG_CG2900) += devices-cg2900-u5500.o -obj-$(CONFIG_CG2900) += board-u5500-cg2900.o -endif +obj-$(CONFIG_CG2900) += board-mop500-cg2900.o devices-cg2900.o obj-y += mfd/ obj-y += bluetooth/ |