[kernel] r5560 - in dists/sid/linux-2.6/debian: arch/m68k patches patches/series

[Bastian Blank]

Author: waldi
Date: Sun Jan 22 12:49:31 2006
New Revision: 5560

Removed:
   dists/sid/linux-2.6/debian/patches/m68k-2.6.15.patch
   dists/sid/linux-2.6/debian/patches/series/4-extra
Modified:
   dists/sid/linux-2.6/debian/arch/m68k/config
   dists/sid/linux-2.6/debian/arch/m68k/config.amiga
   dists/sid/linux-2.6/debian/arch/m68k/config.atari
   dists/sid/linux-2.6/debian/arch/m68k/config.mac
   dists/sid/linux-2.6/debian/arch/m68k/config.q40
   dists/sid/linux-2.6/debian/patches/series/2-extra
Log:
Revert r5547. Modifies released patch series.


Modified: dists/sid/linux-2.6/debian/arch/m68k/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/m68k/config	(original)
+++ dists/sid/linux-2.6/debian/arch/m68k/config	Sun Jan 22 12:49:31 2006
@@ -1,13 +1,3 @@
-# we don't trust the compiler, unfortunately, this does not fix the *vme* problems
-CONFIG_CC_OPTIMIZE_FOR_SIZE=n
-# build in SCSI for m68k
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-# disable ISCSI to avoid
-# include/scsi/iscsi_if.h:241: error: syntax error before "volatile"
-CONFIG_SCSI_ISCSI_ATTRS=n
-CONFIG_ISCSI_TCP=n
-#
 CONFIG_M68K=y
 CONFIG_MMU=y
 CONFIG_UID16=y

Modified: dists/sid/linux-2.6/debian/arch/m68k/config.amiga
==============================================================================
--- dists/sid/linux-2.6/debian/arch/m68k/config.amiga	(original)
+++ dists/sid/linux-2.6/debian/arch/m68k/config.amiga	Sun Jan 22 12:49:31 2006
@@ -40,8 +40,7 @@
 CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECD=y
-# disable IDETAPE, causes ICE
-CONFIG_BLK_DEV_IDETAPE=n
+CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_IDE_GENERIC=y
 # CONFIG_IDE_ARM is not set

Modified: dists/sid/linux-2.6/debian/arch/m68k/config.atari
==============================================================================
--- dists/sid/linux-2.6/debian/arch/m68k/config.atari	(original)
+++ dists/sid/linux-2.6/debian/arch/m68k/config.atari	Sun Jan 22 12:49:31 2006
@@ -32,8 +32,7 @@
 CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECD=y
-# disable IDETAPE, causes ICE
-CONFIG_BLK_DEV_IDETAPE=n
+CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_IDE_GENERIC=y
 # CONFIG_IDE_ARM is not set

Modified: dists/sid/linux-2.6/debian/arch/m68k/config.mac
==============================================================================
--- dists/sid/linux-2.6/debian/arch/m68k/config.mac	(original)
+++ dists/sid/linux-2.6/debian/arch/m68k/config.mac	Sun Jan 22 12:49:31 2006
@@ -1,4 +1,3 @@
-CONFIG_WINDFARM=n
 CONFIG_CLEAN_COMPILE=y
 # CONFIG_SUN3 is not set
 # CONFIG_AMIGA is not set
@@ -27,8 +26,7 @@
 CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECD=y
-# disable IDETAPE, causes ICE
-CONFIG_BLK_DEV_IDETAPE=n
+CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_IDE_GENERIC=y
 # CONFIG_IDE_ARM is not set

Modified: dists/sid/linux-2.6/debian/arch/m68k/config.q40
==============================================================================
--- dists/sid/linux-2.6/debian/arch/m68k/config.q40	(original)
+++ dists/sid/linux-2.6/debian/arch/m68k/config.q40	Sun Jan 22 12:49:31 2006
@@ -28,8 +28,7 @@
 CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECD=y
-# disable IDETAPE, causes ICE
-CONFIG_BLK_DEV_IDETAPE=n
+CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_IDE_GENERIC=y
 # CONFIG_IDE_ARM is not set

Modified: dists/sid/linux-2.6/debian/patches/series/2-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/2-extra	(original)
+++ dists/sid/linux-2.6/debian/patches/series/2-extra	Sun Jan 22 12:49:31 2006
@@ -1,2 +1,2 @@
 + hppa-incompatible.patch hppa
-#+ m68k-incompatible.patch m68k
++ m68k-incompatible.patch m68k