Added NFC modules; Updated file tabs/spacing.
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 9dfa990..7f47c9a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -152,9 +152,9 @@
 # Qualcomm support
 TARGET_USES_QCOM_BSP := true
 COMMON_GLOBAL_CFLAGS += -DQCOM_HARDWARE -DQCOM_BSP
-#HAVE_SYNAPTICS_I2C_RMI4_FW_UPGRADE   := true
-#USE_DEVICE_SPECIFIC_QCOM_PROPRIETARY := true
-#TARGET_USES_NEW_ION_API := true
+HAVE_SYNAPTICS_I2C_RMI4_FW_UPGRADE   := true
+USE_DEVICE_SPECIFIC_QCOM_PROPRIETARY := true
+TARGET_USES_NEW_ION_API := true
 
 #Includes
 TARGET_SPECIFIC_HEADER_PATH := $(LOCAL_PATH)/include
diff --git a/device.mk b/device.mk
index 080cf80..9b7a5bb 100644
--- a/device.mk
+++ b/device.mk
@@ -33,7 +33,6 @@
 	Tag \
 	com.android.nfc_extras \
 	com.android.nfc.helper \
-	Nfc \
 	NfcNci
 
 # Audio