[kernel] r19494 - in dists/trunk/linux/debian: . config/sparc

[Bastian Blank]

Author: waldi
Date: Sun Nov 11 11:39:12 2012
New Revision: 19494

Log:
* debian/changelog: Update.
* debian/config/sparc/config: Remove ipv4 related overrides.

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/sparc/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sun Nov 11 11:31:07 2012	(r19493)
+++ dists/trunk/linux/debian/changelog	Sun Nov 11 11:39:12 2012	(r19494)
@@ -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 @@
   * 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 <uwe at kleine-koenig.org>  Mon, 29 Oct 2012 15:50:12 +0100
 
 linux (3.6.4-1~experimental.1) experimental; urgency=low

Modified: dists/trunk/linux/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux/debian/config/sparc/config	Sun Nov 11 11:31:07 2012	(r19493)
+++ dists/trunk/linux/debian/config/sparc/config	Sun Nov 11 11:39:12 2012	(r19494)
@@ -567,18 +567,6 @@
 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
 ##
 CONFIG_IPV6=y