From 2ef4ec79409a40304df7f15cbbfd30259292b582 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 11 Nov 2012 11:39:12 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config/sparc/config: Remove ipv4 related overrides. svn path=/dists/trunk/linux/; revision=19494 --- debian/changelog | 5 ++++- debian/config/sparc/config | 12 ------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 50375202f..c39599a26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux (3.6.6-1~experimental.2) UNRELEASED; urgency=low +linux (3.6.6-1~experimental.1) UNRELEASED; urgency=low * New upstream stable update: http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.6.5 @@ -19,6 +19,9 @@ linux (3.6.6-1~experimental.2) UNRELEASED; urgency=low * rc: Enable RC_DEVICES; re-enable LIRC; re-enable the drivers that depend on those; enable IR_SANYO_DECODER and IR_IGUANA as modules + [ Bastian Blank ] + * [sparc] Remove IP_PNP, IP_PNP_RARP, NET_IPGRE and ARPD overrides. + -- Uwe Kleine-König Mon, 29 Oct 2012 15:50:12 +0100 linux (3.6.4-1~experimental.1) experimental; urgency=low diff --git a/debian/config/sparc/config b/debian/config/sparc/config index e7fd5f33e..f7efefb12 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -566,18 +566,6 @@ CONFIG_SPARSEMEM_MANUAL=y CONFIG_DECNET=m CONFIG_DECNET_ROUTER=y -## -## file: net/ipv4/Kconfig -## -CONFIG_IP_PNP=y -# CONFIG_IP_PNP_DHCP is not set -# CONFIG_IP_PNP_BOOTP is not set -CONFIG_IP_PNP_RARP=y -#. TODO -# CONFIG_NET_IPGRE is not set -#. TODO -CONFIG_ARPD=y - ## ## file: net/ipv6/Kconfig ##