From e6c6e7e197ab66c2049fdbf81c35697cc4997e45 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Wed, 11 Mar 2009 15:12:51 +0000
Subject: [PATCH] * debian/changelog: Update. * debian/config/s390/config.s390:
 Disable BTRFS.

svn path=/dists/trunk/linux-2.6/; revision=13088
---
 debian/changelog               | 1 +
 debian/config/s390/config.s390 | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ee1339994..487d18410 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ linux-2.6 (2.6.29~rc7-1~experimental.1) UNRELEASED; urgency=low
   * Use external source directory for all builds.
   * Use dh_prep.
   * Update copyright file.
+  * [s390/s390] Disable BTRFS.
 
   [ Martin Michlmayr ]
   * [mips/r4k-ip22] Build in RTC_DRV_DS1286.
diff --git a/debian/config/s390/config.s390 b/debian/config/s390/config.s390
index ed3705a7f..1a04cd239 100644
--- a/debian/config/s390/config.s390
+++ b/debian/config/s390/config.s390
@@ -13,6 +13,11 @@ CONFIG_MARCH_G5=y
 CONFIG_IPL_VM=y
 ## end choice
 
+## file: fs/btrfs/Kconfig
+##
+#. Needs __ucmpdi2
+# CONFIG_BTRFS_FS is not set
+
 ##
 ## file: mm/Kconfig
 ##