diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 17:48:01 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 17:48:01 -0700 |
| commit | b3e4f06ff6372eca2a0f1ee41d3fb25cb683c117 (patch) | |
| tree | b31345015ab1c06d9936e46af90e37ad85518529 | |
| parent | cffb81e0f8b4e37522c1ae763bc97c00702a21e3 (diff) | |
| parent | e9890bce2725de10f5b42f14e430878ccf712b69 (diff) | |
| download | external_dhcpcd-b3e4f06ff6372eca2a0f1ee41d3fb25cb683c117.zip external_dhcpcd-b3e4f06ff6372eca2a0f1ee41d3fb25cb683c117.tar.gz external_dhcpcd-b3e4f06ff6372eca2a0f1ee41d3fb25cb683c117.tar.bz2 | |
Merge korg/donut into korg/master
| -rw-r--r-- | Android.mk | 14 | ||||
| -rw-r--r-- | android.conf | 2 |
2 files changed, 8 insertions, 8 deletions
@@ -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 |