[x86] nfc: Enable NFC_HCI, NFC_MEI_PHY, NFC_PN544, NFC_PN544_MEI as modules (Closes: #770323)

svn path=/dists/trunk/linux/; revision=22588
This commit is contained in:
Ben Hutchings 2015-05-10 20:05:03 +00:00
parent b125f8fb50
commit c8df9cd7be
2 changed files with 18 additions and 0 deletions

2
debian/changelog vendored
View File

@ -144,6 +144,8 @@ linux (4.0.2-1~exp1) UNRELEASED; urgency=medium
* [x86] serial: Enable SERIAL_8250_DW as built-in
* [armhf] Enable ARM_ERRATA_430973 (Closes: #768890), ARM_ERRATA_643719,
ARM_ERRATA_754327, ARM_ERRATA_773022
* [x86] nfc: Enable NFC_HCI, NFC_MEI_PHY, NFC_PN544, NFC_PN544_MEI as
modules (Closes: #770323)
[ Ian Campbell ]
* [armhf] Enable support for Freescale SNVS RTC. (Closes: #782364)

View File

@ -1160,6 +1160,17 @@ CONFIG_TMD_HERMES=m
CONFIG_PCI_HERMES=m
CONFIG_PCMCIA_HERMES=m
##
## file: drivers/nfc/Kconfig
##
CONFIG_NFC_MEI_PHY=m
##
## file: drivers/nfc/pn544/Kconfig
##
CONFIG_NFC_PN544=m
CONFIG_NFC_PN544_MEI=m
##
## file: drivers/pci/Kconfig
##
@ -1840,6 +1851,11 @@ CONFIG_IRNET=m
##
CONFIG_LAPB=m
##
## file: net/nfc/Kconfig
##
CONFIG_NFC_HCI=m
##
## file: net/vmw_vsock/Kconfig
##