[kernel] r9980 - in dists/sid/linux-2.6/debian: . config/hppa

[Maximilian Attems]

Author: maks
Date: Wed Dec 19 13:08:34 2007
New Revision: 9980

Log:
apply 703ef64174dd55579ba6ea708ac0f6c3b042d5d9 from trunk
to make hppa buildable, leave gcc-4.1 hardcoding to maintainer.


Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/hppa/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Wed Dec 19 13:08:34 2007
@@ -85,6 +85,7 @@
   * Add stable release 2.6.23.12:
     - Revert "PNP: increase the maximum number of resources"
   * VM/Security: add security hook to do_brk (CVE-2007-6434)
+  * [hppa]: Disable OCFS2, due build trouble.
 
   [ Martin Michlmayr ]
   * [arm/iop32x] Re-enable USB_NET and PPP, thanks Daniel Hess (closes:
@@ -96,7 +97,7 @@
     platform.
   * Add em28xx-dv100.patch to add support for Pinnacle Dazzle DVC 100.
 
- -- maximilian attems <maks at debian.org>  Wed, 19 Dec 2007 14:01:59 +0100
+ -- maximilian attems <maks at debian.org>  Wed, 19 Dec 2007 14:07:18 +0100
 
 linux-2.6 (2.6.23-1) unstable; urgency=low
 

Modified: dists/sid/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/hppa/config	(original)
+++ dists/sid/linux-2.6/debian/config/hppa/config	Wed Dec 19 13:08:34 2007
@@ -638,6 +638,7 @@
 CONFIG_TMPFS=y
 CONFIG_RAMFS=y
 # CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_ASFS_FS is not set