Merge branch 'froyo' of git@github.com:CyanogenMod/android_vendor_cyanogen into HEAD
diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk
index 3c7d92c..f1d6429 100644
--- a/products/cyanogen_inc.mk
+++ b/products/cyanogen_inc.mk
@@ -12,6 +12,9 @@
PRODUCT_MODEL := Incredible
PRODUCT_MANUFACTURER := HTC
+# Build Kernel
+PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/inc/kernel
+
#
# Set ro.modversion
#
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
index 095f328..10723e6 100644
--- a/products/cyanogen_sholes.mk
+++ b/products/cyanogen_sholes.mk
@@ -24,7 +24,7 @@
ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Droid
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-6.0.0-Droid-alpha6
+ ro.modversion=CyanogenMod-6.0.0-Droid-alpha7
endif
PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRF84B BUILD_DISPLAY_ID=FRF84B PRODUCT_NAME=voles TARGET_DEVICE=sholes BUILD_FINGERPRINT=verizon/voles/sholes/sholes:2.2/FRF84B/42477:user/release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="voles-user 2.2 FRF84B 42477 release-keys" BUILD_NUMBER=42477 BUILD_UTC_DATE=1277333704 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build