From 153c3f2e0a47222a58da7a7fe9fb32e405a8373b Mon Sep 17 00:00:00 2001
From: Dmitry Shmidt <>
Date: Mon, 20 Apr 2009 09:52:55 -0700
Subject: AI 146935: am: CL 146934 Make TI Wifi driver choice
 framework-independent - part 1   Original author: dimitrysh

Automated import of CL 146935
---
 Android.mk   | 14 +++++++-------
 android.conf |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Android.mk b/Android.mk
index 1e1aea8..d586825 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,13 +23,13 @@ LOCAL_MODULE = showlease
 LOCAL_MODULE_TAGS := debug
 include $(BUILD_EXECUTABLE)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := dhcpcd.conf
-LOCAL_MODULE_TAGS := user
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(etc_dir)
-LOCAL_SRC_FILES := android.conf
-include $(BUILD_PREBUILT)
+#include $(CLEAR_VARS)
+#LOCAL_MODULE := dhcpcd.conf
+#LOCAL_MODULE_TAGS := user
+#LOCAL_MODULE_CLASS := ETC
+#LOCAL_MODULE_PATH := $(etc_dir)
+#LOCAL_SRC_FILES := android.conf
+#include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := dhcpcd-run-hooks
diff --git a/android.conf b/android.conf
index 5aa418d..54006c7 100644
--- a/android.conf
+++ b/android.conf
@@ -1,6 +1,6 @@
 # dhcpcd configuration for Android Wi-Fi interface
 # See dhcpcd.conf(5) for details.
 
-interface tiwlan0
+interface wlan0
 # dhcpcd-run-hooks uses these options.
 option subnet_mask, routers, domain_name_servers
-- 
cgit v1.1