[kernel] r12260 - in dists/sid/linux-2.6/debian: . config/arm

[Martin Michlmayr]

Author: tbm
Date: Sat Sep 27 14:13:33 2008
New Revision: 12260

Log:
[arm/orion5x] Enable CONFIG_ATALK


Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/arm/config.orion5x

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sat Sep 27 14:13:33 2008
@@ -1,14 +1,18 @@
 linux-2.6 (2.6.26-7) UNRELEASED; urgency=low
 
+  [ Bastian Blank ]
   * [xen] Add SuSE Xen patch.
-  
+
   [ Stephen R. Marenka ]
   * [m68k] Set CONFIG_ATARI_ETHERNEC=m for atari, since it only works
     in modular form.
   * [m68k] Enable CONFIG_ADB_PMU68K=y for mac.
-  * [m68k] Add atari-aranym-nf-wrappers.diff patch to fix atari LBD 
+  * [m68k] Add atari-aranym-nf-wrappers.diff patch to fix atari LBD
     problems, set CONFIG_LBD=y for atari.
 
+  [ Martin Michlmayr ]
+  * [arm/orion5x] Enable CONFIG_ATALK (requested by Ben Schwarz).
+
  -- Bastian Blank <waldi at debian.org>  Wed, 24 Sep 2008 15:18:27 +0200
 
 linux-2.6 (2.6.26-6) unstable; urgency=low

Modified: dists/sid/linux-2.6/debian/config/arm/config.orion5x
==============================================================================
--- dists/sid/linux-2.6/debian/config/arm/config.orion5x	(original)
+++ dists/sid/linux-2.6/debian/config/arm/config.orion5x	Sat Sep 27 14:13:33 2008
@@ -305,6 +305,14 @@
 CONFIG_NETCONSOLE=m
 
 ##
+## file: drivers/net/appletalk/Kconfig
+##
+CONFIG_ATALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+
+##
 ## file: drivers/net/arcnet/Kconfig
 ##
 # CONFIG_ARCNET is not set