From 6f83268163e6c74083832dbf3bb4633b714e2563 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Fri, 14 Mar 2008 21:02:08 +0000
Subject: [PATCH] * debian/changelog: Update. * debian/config/alpha/config,
 debian/config/armel/config,   debian/config/ia64/config,
 debian/config/sparc/config:   Remove redifitions. *
 debian/config/hppa/config: Enable several filesystems.

svn path=/dists/trunk/linux-2.6/; revision=10874
---
 debian/changelog           |  1 +
 debian/config/alpha/config |  2 --
 debian/config/armel/config |  6 ------
 debian/config/hppa/config  | 31 -------------------------------
 debian/config/ia64/config  |  5 -----
 debian/config/sparc/config |  5 -----
 6 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f0410694..b7cccce31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -73,6 +73,7 @@ linux-2.6 (2.6.25~rc5-1~experimental.1) UNRELEASED; urgency=low
   * [s390] Enable DM_MULTIPATH_EMC.
   * Enable AF_RXRPC and RXKAD.
   * Disable R3964.
+  * [hppa] Enable several filesystems.
 
  -- Bastian Blank <waldi@debian.org>  Tue, 26 Feb 2008 23:59:55 -0700
 
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index 11a6f8d41..740968093 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -1359,8 +1359,6 @@ CONFIG_USBPCWATCHDOG=m
 ## file: fs/Kconfig
 ##
 CONFIG_EXT2_FS=y
-CONFIG_JBD=m
-CONFIG_FS_MBCACHE=y
 
 ##
 ## file: fs/Kconfig.binfmt
diff --git a/debian/config/armel/config b/debian/config/armel/config
index 4cf3ce7a3..31821a5a7 100644
--- a/debian/config/armel/config
+++ b/debian/config/armel/config
@@ -21,12 +21,6 @@ CONFIG_SLIP_SMART=y
 ##
 # CONFIG_IPW2100 is not set
 
-##
-## file: fs/Kconfig
-##
-CONFIG_JBD=y
-CONFIG_SUNRPC_GSS=m
-
 ##
 ## file: net/econet/Kconfig
 ##
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index 18a885f2d..d151afa97 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -694,45 +694,14 @@ CONFIG_LOGO_PARISC_CLUT224=y
 ## file: fs/Kconfig
 ##
 CONFIG_EXT2_FS=y
-CONFIG_JBD=m
-CONFIG_FS_MBCACHE=y
-# CONFIG_OCFS2_FS is not set
-CONFIG_SYSFS=y
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
 CONFIG_CRAMFS=y
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-CONFIG_NFS_FS=y
 CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
-CONFIG_NFS_ACL_SUPPORT=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_RPCSEC_GSS_KRB5=y
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
 
 ##
 ## file: fs/partitions/Kconfig
 ##
 # CONFIG_PARTITION_ADVANCED is not set
 
-##
-## file: fs/xfs/Kconfig
-##
-# CONFIG_XFS_FS is not set
-
 ##
 ## file: init/Kconfig
 ##
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index d875ba0eb..7f69ed0e7 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -972,11 +972,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
 ##
 # CONFIG_WATCHDOG is not set
 
-##
-## file: fs/Kconfig
-##
-CONFIG_PROC_VMCORE=y
-
 ##
 ## file: fs/partitions/Kconfig
 ##
diff --git a/debian/config/sparc/config b/debian/config/sparc/config
index bb2fa97b4..3df2405c3 100644
--- a/debian/config/sparc/config
+++ b/debian/config/sparc/config
@@ -271,11 +271,6 @@ CONFIG_LOGO=y
 ##
 CONFIG_EXT2_FS=y
 
-##
-## file: fs/ncpfs/Kconfig
-##
-# CONFIG_NCPFS_EXTRAS is not set
-
 ##
 ## file: fs/partitions/Kconfig
 ##