diff --git a/debian/changelog b/debian/changelog index 3d652eace..d546cba8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ linux-2.6 (3.1.0~rc2-1~experimental.1) UNRELEASED; urgency=low * [x86] ACPI: Enable ACPI_APEI_GHES as built-in (no longer modular). Enable ACPI_APEI_MEMORY_FAILURE. * netfilter: Enable IP_SET_HASH_NETIFACE as module + * net: Enable NFC, NFC_PN533 as modules -- Ben Hutchings Wed, 27 Jul 2011 23:58:10 +0200 diff --git a/debian/config/config b/debian/config/config index 16517444f..e7b7970f2 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2091,6 +2091,11 @@ CONFIG_WL12XX_SDIO=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set +## +## file: drivers/nfc/Kconfig +## +CONFIG_NFC_PN533=m + ## ## file: drivers/of/Kconfig ## @@ -4199,6 +4204,11 @@ CONFIG_IP_VS_PE_SIP=m ## # CONFIG_NETLABEL is not set +## +## file: net/nfc/Kconfig +## +CONFIG_NFC=m + ## ## file: net/packet/Kconfig ##