projects
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
94b4350
)
config-tizen: enable pn544 hci option
author
arron.wang
<arron.wang@intel.com>
Thu, 26 Jul 2012 07:29:05 +0000
(15:29 +0800)
committer
arron.wang
<arron.wang@intel.com>
Thu, 26 Jul 2012 07:29:05 +0000
(15:29 +0800)
arch/x86/configs/tizen_bb_defconfig
patch
|
blob
|
history
diff --git
a/arch/x86/configs/tizen_bb_defconfig
b/arch/x86/configs/tizen_bb_defconfig
index
f65fd11
..
ea9b20e
100644
(file)
--- a/
arch/x86/configs/tizen_bb_defconfig
+++ b/
arch/x86/configs/tizen_bb_defconfig
@@
-2472,8
+2472,15
@@
CONFIG_LEDS_INTEL_KPD=y
#
# LED Triggers
#
-CONFIG_NFC_DEVICES=y
-CONFIG_PN544_NFC=y
+CONFIG_NFC=y
+# CONFIG_NFC_NCI is not set
+# CONFIG_NFC_LLCP is not set
+# CONFIG_NFC_PN533 is not set
+# CONFIG_PN544_NFC is not set
+# CONFIG_PN544_NFC_NXP is not set
+CONFIG_NFC_HCI=y
+CONFIG_NFC_SHDLC=y
+CONFIG_PN544_HCI_NFC=y
CONFIG_SWITCH=y
# CONFIG_SWITCH_GPIO is not set
CONFIG_SWITCH_MID=y