[kernel] r11540 - in dists/trunk/linux-2.6/debian/config: amd64 powerpc

[Bastian Blank]

Author: waldi
Date: Sat Jun  7 11:33:50 2008
New Revision: 11540

Log:
* debian/config/amd64/config: Remove duplicated SPARSEMEM_VMEMMAP.
* debian/config/powerpc/config.powerpc64: Fix.


Modified:
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Sat Jun  7 11:33:50 2008
@@ -1472,7 +1472,6 @@
 ## file: mm/Kconfig
 ##
 CONFIG_RESOURCES_64BIT=y
-CONFIG_SPARSEMEM_VMEMMAP=y
 
 ##
 ## file: net/atm/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64	(original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64	Sat Jun  7 11:33:50 2008
@@ -137,8 +137,8 @@
 CONFIG_GELIC_NET=m
 CONFIG_GELIC_WIRELESS=y
 # CONFIG_MV643XX_ETH is not set
-CONFIG_PASEMI_MAC=m
 CONFIG_EHEA=m
+CONFIG_PASEMI_MAC=m
 
 ##
 ## file: drivers/net/ibm_newemac/Kconfig