diff --git a/debian/changelog b/debian/changelog index 7bad9570d..d91140f1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,16 @@ linux (3.10~rc7-1~exp1) UNRELEASED; urgency=low * [x86] cpufreq: Enable X86_INTEL_PSTATE (Closes: #712062) * debian/control: Add Homepage field * debian/watch: Add watch file and update script + * misc: Enable BMP085_I2C as module + * team: Enable NET_TEAM_MODE_RANDOM as module + * 8021q: Enable VLAN_8021Q_MVRP + * batman: Enable BATMAN_ADV_NC + * netlink: Enable NETLINK_MMAP, NETLINK_DIAG [!armel/{iop32x,ixp4xx,orion5x}] + * sctp: Enable SCTP_COOKIE_HMAC_SHA1 + * tipc: Enable TIPC_MEDIA_IB + * [x86] cpufreq: Enable X86_AMD_FREQ_SENSITIVITY as module + * [x86] i2c: Enable I2C_ISMT, I2C_DESIGNWARE_PCI as modules + * [x86] mouse: Enable MOUSE_CYAPA as modules -- Ben Hutchings Thu, 13 Jun 2013 01:50:52 +0100 diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x index 31d812b8c..72e59facf 100644 --- a/debian/config/armel/config.iop32x +++ b/debian/config/armel/config.iop32x @@ -644,6 +644,12 @@ CONFIG_IPX_INTERN=y ## # CONFIG_LAPB is not set +## +## file: net/netlink/Kconfig +## +# CONFIG_NETLINK_MMAP is not set +# CONFIG_NETLINK_DIAG is not set + ## ## file: security/keys/Kconfig ## diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index 032b60527..ef7184d2d 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -778,6 +778,12 @@ CONFIG_IPX_INTERN=y ## CONFIG_LAPB=m +## +## file: net/netlink/Kconfig +## +# CONFIG_NETLINK_MMAP is not set +# CONFIG_NETLINK_DIAG is not set + ## ## file: security/keys/Kconfig ## diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index 34033302f..330a17dd5 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -627,6 +627,12 @@ CONFIG_ROSE=m ## CONFIG_IPV6=m +## +## file: net/netlink/Kconfig +## +# CONFIG_NETLINK_MMAP is not set +# CONFIG_NETLINK_DIAG is not set + ## ## file: unknown ## diff --git a/debian/config/config b/debian/config/config index aad8bcda7..7ee418b13 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1795,6 +1795,7 @@ CONFIG_HMC6352=m CONFIG_DS1682=m CONFIG_TI_DAC7512=m CONFIG_VMWARE_BALLOON=m +CONFIG_BMP085_I2C=m # CONFIG_PCH_PHUB is not set # CONFIG_USB_SWITCH_FSA9480 is not set # CONFIG_SRAM is not set @@ -2434,6 +2435,7 @@ CONFIG_NET_TEAM_MODE_BROADCAST=m CONFIG_NET_TEAM_MODE_ROUNDROBIN=m CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m CONFIG_NET_TEAM_MODE_LOADBALANCE=m +CONFIG_NET_TEAM_MODE_RANDOM=m ## ## file: drivers/net/usb/Kconfig @@ -4471,6 +4473,7 @@ CONFIG_WIRELESS=y ## CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y +CONFIG_VLAN_8021Q_MVRP=y ## ## file: net/9p/Kconfig @@ -4497,6 +4500,7 @@ CONFIG_ATM_BR2684=m CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y +CONFIG_BATMAN_ADV_NC=y # CONFIG_BATMAN_ADV_DEBUG is not set ## @@ -4916,6 +4920,12 @@ CONFIG_IP_VS_PE_SIP=m ## # CONFIG_NETLABEL is not set +## +## file: net/netlink/Kconfig +## +CONFIG_NETLINK_MMAP=y +CONFIG_NETLINK_DIAG=y + ## ## file: net/nfc/Kconfig ## @@ -5040,6 +5050,8 @@ CONFIG_IP_SCTP=m CONFIG_NET_SCTPPROBE=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set +CONFIG_SCTP_COOKIE_HMAC_MD5=y +CONFIG_SCTP_COOKIE_HMAC_SHA1=y ## ## file: net/sunrpc/Kconfig @@ -5051,6 +5063,7 @@ CONFIG_RPCSEC_GSS_KRB5=m ## CONFIG_TIPC=m CONFIG_TIPC_PORTS=8191 +CONFIG_TIPC_MEDIA_IB=y ## ## file: net/unix/Kconfig diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index e59d10d08..0986d67f5 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -359,6 +359,7 @@ CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_AMD_FREQ_SENSITIVITY=m CONFIG_X86_SPEEDSTEP_CENTRINO=m CONFIG_X86_P4_CLOCKMOD=m @@ -556,6 +557,7 @@ CONFIG_I2C_AMD756=m CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m CONFIG_I2C_I801=m +CONFIG_I2C_ISMT=m CONFIG_I2C_PIIX4=m CONFIG_I2C_NFORCE2=m CONFIG_I2C_SIS5595=m @@ -564,6 +566,7 @@ CONFIG_I2C_SIS96X=m CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m CONFIG_I2C_SCMI=m +CONFIG_I2C_DESIGNWARE_PCI=m CONFIG_I2C_EG20T=m CONFIG_I2C_PARPORT=m CONFIG_I2C_PARPORT_LIGHT=m @@ -616,6 +619,7 @@ CONFIG_MOUSE_PS2=m CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_CYAPA=m CONFIG_MOUSE_VSXXXAA=m ##