From cd93fe109769fe0869c0f28d52f66cdaf7ee7092 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Fri, 8 Jul 2011 13:28:17 -0700 Subject: Tuna kernel prebuilt, built-in wifi driver with cfg80211 f7bcada ARM: omap: tuna: Switch wlan to CFG80211 and built-in driver 3183df0 maguro: misc: modem_if: mipi_link: Update mipi-hsi link device f2a4fff Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 Change-Id: I84df5986da476fdbd4244221aa388ab492655bb2 Signed-off-by: Dmitry Shmidt --- device.mk | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'device.mk') diff --git a/device.mk b/device.mk index 4109e7c..d558048 100644 --- a/device.mk +++ b/device.mk @@ -50,15 +50,12 @@ PRODUCT_COPY_FILES := \ PRODUCT_COPY_FILES += \ system/bluetooth/data/main.le.conf:system/etc/bluetooth/main.conf -ifeq ($(TARGET_PREBUILT_WIFI_MODULE),) -LOCAL_WIFI_MODULE := device/samsung/tuna/bcmdhd.ko -else -LOCAL_WIFI_MODULE := $(TARGET_PREBUILT_WIFI_MODULE) -endif - # Wifi +ifneq ($(TARGET_PREBUILT_WIFI_MODULE),) +PRODUCT_COPY_FILES += \ + $(TARGET_PREBUILT_WIFI_MODULE):system/lib/modules/bcmdhd.ko +endif PRODUCT_COPY_FILES += \ - $(LOCAL_WIFI_MODULE):system/lib/modules/bcmdhd.ko \ device/samsung/tuna/bcmdhd.cal:system/etc/wifi/bcmdhd.cal PRODUCT_PROPERTY_OVERRIDES := \ -- cgit v1.1