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

[Christian T. Steigies]

Author: cts
Date: Tue May  9 20:45:39 2006
New Revision: 6548

Added:
   dists/sid/linux-2.6/debian/patches/m68k-atari-stdma.patch
   dists/sid/linux-2.6/debian/patches/m68k-atyfb.patch
Modified:
   dists/sid/linux-2.6/debian/arch/m68k/defines
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/13-extra

Log:
atari patches


Modified: dists/sid/linux-2.6/debian/arch/m68k/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/m68k/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/m68k/defines	Tue May  9 20:45:39 2006
@@ -2,7 +2,7 @@
 compiler: gcc-3.3
 flavours:
  amiga
-# does not build currently: atari
+ atari
  bvme6000
  hp
  mac

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue May  9 20:45:39 2006
@@ -5,13 +5,16 @@
     - smbfs chroot issue (CVE-2006-1864)
 
   [ Bastian Blank ]
-  * Don't make headers packages depend on images. 
+  * Don't make headers packages depend on images.
   * Bump abiname to 2. (closes: #366291)
   * Update vserver patch to 2.0.2-rc19.
   * Update xen patch to changeset 9668.
   * Remove abi fixes.
 
- -- Bastian Blank <waldi at debian.org>  Tue,  9 May 2006 11:25:13 +0200
+  [ Christian T. Steigies ]
+  * [m68k] Add patches that allow building images for atari
+
+ -- Christian T. Steigies <cts at debian.org>  Tue,  9 May 2006 22:42:34 +0200
 
 linux-2.6 (2.6.16-12) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/m68k-atari-stdma.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/m68k-atari-stdma.patch	Tue May  9 20:45:39 2006
@@ -0,0 +1,28 @@
+Log message:
+irqreturn_t is defined in <linux/interrupt.h>
+
+Modified files:
+    linux/include/asm-m68k:
+	atari_stdma.h 
+
+
+Index: linux/include/asm-m68k/atari_stdma.h
+Stats: 2 modifications
+http://linux-m68k-cvs.ubb.ca/c/cvsweb/linux/include/asm%2dm68k/atari_stdma%2eh.diff?r1=1.2&r2=1.3
+========================================================================
+--- linux/include/asm-m68k/atari_stdma.h	9 May 2003 08:39:20 -0000	1.2
++++ linux/include/asm-m68k/atari_stdma.h	9 May 2006 18:47:28 -0000	1.3
+@@ -3,7 +3,7 @@
+ #define _atari_stdma_h
+ 
+ 
+-#include <asm/irq.h>
++#include <linux/interrupt.h>
+ 
+ 
+ /***************************** Prototypes *****************************/
+-
+To unsubscribe from this list: send the line "unsubscribe linux-m68k-cvscommit" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+

Added: dists/sid/linux-2.6/debian/patches/m68k-atyfb.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/m68k-atyfb.patch	Tue May  9 20:45:39 2006
@@ -0,0 +1,39 @@
+Log message:
+atyfb_driver is protected with CONFIG_PCI
+
+Modified files:
+    linux/drivers/video/aty:
+	atyfb_base.c 
+
+
+Index: linux/drivers/video/aty/atyfb_base.c
+Stats: 4 insertions
+http://linux-m68k-cvs.ubb.ca/c/cvsweb/linux/drivers/video/aty/atyfb_base%2ec.diff?r1=1.1.1.29&r2=1.6
+========================================================================
+--- linux/drivers/video/aty/atyfb_base.c	9 Apr 2006 16:56:04 -0000	1.1.1.29
++++ linux/drivers/video/aty/atyfb_base.c	9 May 2006 18:49:14 -0000	1.6
+@@ -3719,7 +3719,9 @@
+     atyfb_setup(option);
+ #endif
+ 
++#ifdef CONFIG_PCI
+     pci_register_driver(&atyfb_driver);
++#endif
+ #ifdef CONFIG_ATARI
+     atyfb_atari_probe();
+ #endif
+@@ -3728,7 +3730,9 @@
+ 
+ static void __exit atyfb_exit(void)
+ {
++#ifdef CONFIG_PCI
+ 	pci_unregister_driver(&atyfb_driver);
++#endif
+ }
+ 
+ module_init(atyfb_init);
+-
+To unsubscribe from this list: send the line "unsubscribe linux-m68k-cvscommit" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+

Modified: dists/sid/linux-2.6/debian/patches/series/13-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/13-extra	(original)
+++ dists/sid/linux-2.6/debian/patches/series/13-extra	Tue May  9 20:45:39 2006
@@ -2,3 +2,5 @@
 + vserver-xen-clash.patch *_xen-vserver
 + xen-tree-3.0-testing-9668.patch *_xen *_xen-vserver
 + xen-tls.patch *_xen *_xen-vserver
++ m68k-atari-stdma.patch m68k
++ m68k-atyfb.patch  m68k