merge in gingerbread-release history after reset to gingerbread
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 278bf0c..c082896 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -23,6 +23,7 @@
BOARD_USES_LIBSECRIL_STUB := true
BOARD_NO_PAGE_FLIPPING := true
+BOARD_NO_32BPP := true
# Use the non-open-source parts, if they're present
-include vendor/samsung/crespo/BoardConfigVendor.mk
diff --git a/bcm4329.ko b/bcm4329.ko
index 1cbfe82..80f1e80 100644
--- a/bcm4329.ko
+++ b/bcm4329.ko
Binary files differ
diff --git a/board-info.txt b/board-info.txt
index fff4c8f..915fd34 100644
--- a/board-info.txt
+++ b/board-info.txt
@@ -1,3 +1,3 @@
require board=herring
require version-bootloader=I9020XXKA3
-require version-baseband=I9020XXKC1|I9020UCKC1|M200KRKC1
+require version-baseband=I9020XXKC2|I9020UCKC1|M200KRKC1
diff --git a/device_base.mk b/device_base.mk
index 3c05331..cd43b55 100644
--- a/device_base.mk
+++ b/device_base.mk
@@ -96,13 +96,6 @@
libstagefrighthw \
com.android.future.usb.accessory
-# NFC
-PRODUCT_PACKAGES += \
- libnfc \
- libnfc_jni \
- Nfc \
- Tag
-
# Input device calibration files
PRODUCT_COPY_FILES += \
device/samsung/crespo/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc
diff --git a/kernel b/kernel
index 3c2c38e..b31b608 100644
--- a/kernel
+++ b/kernel
Binary files differ
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 6458a2e..916c1ea 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -80,6 +80,7 @@
BOARD_USES_LIBSECRIL_STUB := false
BOARD_NO_PAGE_FLIPPING := false
+BOARD_NO_32BPP := false
EOF
mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE/overlay/packages/apps/Launcher2/res/layout
