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

[Frederik Schüler]

Author: fs
Date: Mon Jan 23 23:13:48 2006
New Revision: 5579

Added:
   dists/sid/linux-2.6/debian/patches/m68k-2.6.15.patch
      - copied unchanged from r5559, dists/sid/linux-2.6/debian/patches/m68k-2.6.15.patch
   dists/sid/linux-2.6/debian/patches/series/4-extra
      - copied unchanged from r5559, 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:
"Roll back the rollback" - 2.6.15-1 to -3 are not working on m68k, so there is no point in keeping backwards compatibility with these versions. 


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	Mon Jan 23 23:13:48 2006
@@ -1,3 +1,13 @@
+# 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	Mon Jan 23 23:13:48 2006
@@ -40,7 +40,8 @@
 CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_IDETAPE=m
+# disable IDETAPE, causes ICE
+CONFIG_BLK_DEV_IDETAPE=n
 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	Mon Jan 23 23:13:48 2006
@@ -32,7 +32,8 @@
 CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_IDETAPE=m
+# disable IDETAPE, causes ICE
+CONFIG_BLK_DEV_IDETAPE=n
 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	Mon Jan 23 23:13:48 2006
@@ -1,3 +1,4 @@
+CONFIG_WINDFARM=n
 CONFIG_CLEAN_COMPILE=y
 # CONFIG_SUN3 is not set
 # CONFIG_AMIGA is not set
@@ -26,7 +27,8 @@
 CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_IDETAPE=m
+# disable IDETAPE, causes ICE
+CONFIG_BLK_DEV_IDETAPE=n
 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	Mon Jan 23 23:13:48 2006
@@ -28,7 +28,8 @@
 CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_IDETAPE=m
+# disable IDETAPE, causes ICE
+CONFIG_BLK_DEV_IDETAPE=n
 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	Mon Jan 23 23:13:48 2006
@@ -1,2 +1,2 @@
 + hppa-incompatible.patch hppa
-+ m68k-incompatible.patch m68k
+#+ m68k-incompatible.patch m68k