[kernel] r6417 - dists/trunk/linux-2.6/debian/arch/m68k

[Christian T. Steigies]

Author: cts
Date: Fri Apr 14 14:31:00 2006
New Revision: 6417

Modified:
   dists/trunk/linux-2.6/debian/arch/m68k/config
   dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
   dists/trunk/linux-2.6/debian/arch/m68k/config.mac
   dists/trunk/linux-2.6/debian/arch/m68k/config.q40
   dists/trunk/linux-2.6/debian/arch/m68k/defines
Log:
update m68k config, temporarily disable atari


Modified: dists/trunk/linux-2.6/debian/arch/m68k/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config	Fri Apr 14 14:31:00 2006
@@ -228,3 +228,7 @@
 # CONFIG_IEEE80211_CRYPT_WEP is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_IPW2100 is not set
+# new for 2.6.16:
+CONFIG_DM_MULTIPATH_EMC=m
+# CONFIG_SENSORS_F71805F is not set
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.amiga	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.amiga	Fri Apr 14 14:31:00 2006
@@ -196,3 +196,6 @@
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_AMIGA_PARTITION=y
 CONFIG_CRC32=y
+# 2.6.16
+# temporary workaround for old/buggy(?) 53c7xx.c driver
+CONFIG_SCSI_SPI_ATTRS=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mac
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mac	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mac	Fri Apr 14 14:31:00 2006
@@ -38,7 +38,6 @@
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_MAC_SCSI=y
 CONFIG_SCSI_MAC_ESP=y
-CONFIG_DM_MULTIPATH_EMC=m
 CONFIG_ADB=y
 CONFIG_ADB_MACII=y
 CONFIG_ADB_MACIISI=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.q40
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.q40	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.q40	Fri Apr 14 14:31:00 2006
@@ -50,7 +50,6 @@
 # CONFIG_SCSI_SYM53C416 is not set
 # CONFIG_SCSI_T128 is not set
 # CONFIG_CD_NO_IDESCSI is not set
-CONFIG_DM_MULTIPATH_EMC=m
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/defines	Fri Apr 14 14:31:00 2006
@@ -2,7 +2,7 @@
 compiler: gcc-3.3
 flavours:
  amiga
- atari
+# does not build currently: atari
  bvme6000
  hp
  mac