diff --git a/debian/changelog b/debian/changelog index ed298f3a7..ad10e797e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ linux-2.6 (3.2~rc2-1~experimental.1) UNRELEASED; urgency=low * aufs: Update to aufs3.x-rcN-20111114 * ieee802154: Enable IEEE802154_6LOWPAN as module * can: Enable CAN_GW, CAN_EMS_PCMCIA, CAN_PEAK_PCI as modules + * nfc: enable NFC_NCI as module [ Uwe Kleine-König ] * [amd64] reenable rt featureset with 3.2-rc2-rt3 diff --git a/debian/config/config b/debian/config/config index 3fb866923..803d261f8 100644 --- a/debian/config/config +++ b/debian/config/config @@ -4287,6 +4287,11 @@ CONFIG_IP_VS_PE_SIP=m ## CONFIG_NFC=m +## +## file: net/nfc/nci/Kconfig +## +CONFIG_NFC_NCI=m + ## ## file: net/packet/Kconfig ##