From 2489007e7d740ccbc3e0a202914e243ad5178787 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Sat, 22 Sep 2012 09:48:20 +0200 Subject: merge opensource jb u5 Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2 --- drivers/staging/westbridge/astoria/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) mode change 100644 => 100755 drivers/staging/westbridge/astoria/Makefile (limited to 'drivers/staging/westbridge/astoria/Makefile') diff --git a/drivers/staging/westbridge/astoria/Makefile b/drivers/staging/westbridge/astoria/Makefile old mode 100644 new mode 100755 index 907bdb2..377cd29 --- a/drivers/staging/westbridge/astoria/Makefile +++ b/drivers/staging/westbridge/astoria/Makefile @@ -7,5 +7,12 @@ ifneq ($(CONFIG_WESTBRIDGE_DEBUG),y) endif obj-$(CONFIG_WESTBRIDGE) += device/ +ifeq ($(CONFIG_MACH_U1_NA_SPR),y) +obj-$(CONFIG_WESTBRIDGE) += switch/ +else ifeq ($(CONFIG_MACH_U1_NA_USCC),y) +obj-$(CONFIG_WESTBRIDGE) += switch/ +else obj-$(CONFIG_WESTBRIDGE) += block/ -obj-$(CONFIG_WESTBRIDGE) += gadget/ \ No newline at end of file +obj-$(CONFIG_WESTBRIDGE) += gadget/ +endif + -- cgit v1.1