[kernel] r12153 - in dists/sid/linux-2.6/debian: . config/m68k

[Stephen Marenka]

Author: smarenka
Date: Sun Aug 31 07:48:12 2008
New Revision: 12153

Log:
Set CONFIG_LBD=n for atari

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/m68k/config.atari

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sun Aug 31 07:48:12 2008
@@ -2,6 +2,9 @@
 
   [ Martin Michlmayr ]
   * Backport power-off method for Kurobox Pro.
+  
+  [ Stephen R. Marenka ]
+  * [m68k] Set CONFIG_LBD=n for atari, since it conflicts with nfblock.
 
  -- Martin Michlmayr <tbm at cyrius.com>  Fri, 29 Aug 2008 16:02:27 +0300
 

Modified: dists/sid/linux-2.6/debian/config/m68k/config.atari
==============================================================================
--- dists/sid/linux-2.6/debian/config/m68k/config.atari	(original)
+++ dists/sid/linux-2.6/debian/config/m68k/config.atari	Sun Aug 31 07:48:12 2008
@@ -28,6 +28,11 @@
 CONFIG_SERIAL_CONSOLE=y
 
 ##
+### file: block/Kconfig
+### (conflicts with nfblock)
+CONFIG_LBD=n
+
+##
 ## file: drivers/block/Kconfig
 ##
 CONFIG_ATARI_FLOPPY=y