am 2273e358: DO NOT MERGE update for per interface dhcp support

* commit '2273e3582c7c87de6456ede2b6c63b3baca272a2':
  DO NOT MERGE update for per interface dhcp support

full_passion.mk

diff --git a/full_passion.mk b/full_passion.mk
index 003902a..6adcd28 100644
--- a/full_passion.mk
+++ b/full_passion.mk
@@ -19,14 +19,22 @@
 # product configuration (apps).
 #
 
+# Get the long list of APNs
+PRODUCT_COPY_FILES := device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+
+# More telephony settings
+PRODUCT_PROPERTY_OVERRIDES := \
+    ro.ril.hsxpa=1 \
+    ro.ril.gprsclass=10
+
 # Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 # This is where we'd set a backup provider if we had one
 #$(call inherit-product, device/sample/products/backup_overlay.mk)
 $(call inherit-product, device/htc/passion/passion_us.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full.mk)
 
 # Discard inherited values and use our own instead.
 PRODUCT_NAME := full_passion
 PRODUCT_DEVICE := passion
+PRODUCT_BRAND := Android
 PRODUCT_MODEL := Full Android on Passion

init.mahimahi.rc

diff --git a/init.mahimahi.rc b/init.mahimahi.rc
index 87a3b3f..6ffa0e4 100644
--- a/init.mahimahi.rc
+++ b/init.mahimahi.rc
@@ -64,7 +64,7 @@
     group compass misc input
 
 service wpa_supplicant /system/bin/wpa_supplicant \
-    -Dwext -ieth0 -c/data/misc/wifi/wpa_supplicant.conf
+    -Dwext -c/data/misc/wifi/wpa_supplicant.conf
 #   we will start as root and wpa_supplicant will switch to user wifi
 #   after setting up the capabilities required for WEXT
 #   user wifi