r4524 - in dists/trunk/linux-2.6/debian: . arch/m68k patches-debian/series

[Christian T. Steigies]

Author: cts
Date: 2005-10-18 20:54:35 +0000 (Tue, 18 Oct 2005)
New Revision: 4524

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.hp
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches-debian/series/2.6.13+2.6.14-rc4-1
Log:
final patches to make 2.6.13 compile on m68k


Modified: dists/trunk/linux-2.6/debian/arch/m68k/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config	2005-10-18 19:27:34 UTC (rev 4523)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config	2005-10-18 20:54:35 UTC (rev 4524)
@@ -278,6 +278,7 @@
 # CONFIG_INFINIBAND is not set
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
+CONFIG_EXT2_FS_XIP=n
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
 CONFIG_JBD=y
@@ -285,6 +286,7 @@
 CONFIG_XFS_FS=m
 CONFIG_XFS_EXPORT=y
 # CONFIG_XFS_RT is not set
+CONFIG_XFS_QUOTA=n
 # CONFIG_XFS_SECURITY is not set
 # CONFIG_XFS_POSIX_ACL is not set
 CONFIG_SYSFS=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.amiga	2005-10-18 19:27:34 UTC (rev 4523)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.amiga	2005-10-18 20:54:35 UTC (rev 4524)
@@ -76,7 +76,7 @@
 CONFIG_BLZ1230_SCSI=y
 CONFIG_FASTLANE_SCSI=y
 CONFIG_SCSI_AMIGA7XX=y
-CONFIG_OKTAGON_SCSI=y
+CONFIG_OKTAGON_SCSI=n
 # CONFIG_SCSI_NCR53C7xx_FAST is not set
 # CONFIG_CD_NO_IDESCSI is not set
 # CONFIG_DM_MULTIPATH is not set

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.hp
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.hp	2005-10-18 19:27:34 UTC (rev 4523)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.hp	2005-10-18 20:54:35 UTC (rev 4524)
@@ -35,12 +35,17 @@
 CONFIG_PPP_SYNC_TTY=m
 # CONFIG_KEYBOARD_ATKBD is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
+CONFIG_KEYBOARD_HIL_OLD=n
+CONFIG_KEYBOARD_HIL=n
 CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_HIL=n
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_MISC is not set
 CONFIG_SERIO=m
 CONFIG_SERIO_SERPORT=m
+CONFIG_HP_SDC=n
+CONFIG_HIL_MLC=n
 CONFIG_SERIO_LIBPS2=m
 # CONFIG_SERIAL_8250 is not set
 CONFIG_GEN_RTC=y

Modified: dists/trunk/linux-2.6/debian/changelog
===================================================================
--- dists/trunk/linux-2.6/debian/changelog	2005-10-18 19:27:34 UTC (rev 4523)
+++ dists/trunk/linux-2.6/debian/changelog	2005-10-18 20:54:35 UTC (rev 4524)
@@ -60,9 +60,11 @@
   [ Christian T. Steigies ]
   * disable CONFIG_EXT2_FS_XIP for m68k like on all(?) other arches
   * deactivate OKTAGON_SCSI for amiga/m68k until it can be compiled again
-  * deactivate CONFIG_KEYBOARD_HIL, CONFIG_MOUSE_HIL, and CONFIG_HIL_MLC for hp/m68k
-  * enable CONFIG_KEYBOARD_HIL_OLD, CONFIG_HP_SDC for hp/m68k
+  * deactivate CONFIG_KEYBOARD_HIL_OLD, CONFIG_KEYBOARD_HIL, CONFIG_MOUSE_HIL,
+    CONFIG_HIL_MLC, and CONFIG_HP_SDC for hp/m68k
   * update m68k.diff for 2.6.13
+  * split out patches that do not intefere with other arches to
+    patches-debian/m68k-*
 
  -- Simon Horman <horms at debian.org>  Tue, 11 Oct 2005 19:50:55 +0900
 

Modified: dists/trunk/linux-2.6/debian/patches-debian/series/2.6.13+2.6.14-rc4-1
===================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/series/2.6.13+2.6.14-rc4-1	2005-10-18 19:27:34 UTC (rev 4523)
+++ dists/trunk/linux-2.6/debian/patches-debian/series/2.6.13+2.6.14-rc4-1	2005-10-18 20:54:35 UTC (rev 4524)
@@ -3,7 +3,12 @@
 + fbdev-radeon-noaccel.patch
 + fs-asfs-2.patch
 #+ ia64-irq-affinity-upfix.patch
-+ m68k-42_dma.patch 
+#- m68k-42_dma.patch
+#- m68k-sonic.patch
++ m68k-arch.patch
++ m68k-drivers.patch
++ m68k-kernel.patch
++ m68k-include-m68k.patch
 + modular-ide.patch
 + modular-ide-pnp.patch
 + powerpc-calibrate-tau.patch