Author: cts
Date: Tue Jan 2 21:30:32 2007
New Revision: 8069
Added:
dists/sid/linux-2.6/debian/patches/m68k-atari-ide.patch
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches/series/9-extra
Log:
m68k/atari ide patch by Michael Schmitz
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog (original)
+++ dists/sid/linux-2.6/debian/changelog Tue Jan 2 21:30:32 2007
@@ -52,6 +52,7 @@
* m68k/atari: fixes for ethernec and video driver by Michael Schmitz
* m68k/atari: fixes for scsi driver by Michael Schmitz
* m68k/mac: fixes for mace and cuda driver by Finn Thain
+ * m68k/atari: fixes for ide driver by Michael Schmitz
[ maximilian attems ]
* Add stable release 2.6.18.6:
@@ -127,7 +128,7 @@
memory accesses in ehci-hub-control() by adding an alignment attribute
to the tbuf array declaration. Thanks to David Miller for the patch.
- -- maximilian attems <[EMAIL PROTECTED]> Tue, 2 Jan 2007 10:44:09 +0100
+ -- Christian T. Steigies <[EMAIL PROTECTED]> Tue, 2 Jan 2007 19:42:12 +0100
linux-2.6 (2.6.18-8) unstable; urgency=low
Added: dists/sid/linux-2.6/debian/patches/m68k-atari-ide.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/m68k-atari-ide.patch Tue Jan 2
21:30:32 2007
@@ -0,0 +1,24 @@
+That means the IDE interrupt (or the ST-DMA interrupt) doesn't have the
+SA_SHIRQ flag set. Either allow for sharing of both interrupts, or just
+ignore the request_irq failure in the IDE driver.
+
+--- l/drivers/ide/ide-probe.c.org 2007-01-02 10:36:49.000000000 +0100
++++ l/drivers/ide/ide-probe.c 2006-10-21 15:24:58.000000000 +0200
+@@ -1106,8 +1106,14 @@
+ /* clear nIEN */
+ hwif->OUTB(0x08, hwif->io_ports[IDE_CONTROL_OFFSET]);
+
+- if (request_irq(hwif->irq,&ide_intr,sa,hwif->name,hwgroup))
++ if (request_irq(hwif->irq,&ide_intr,sa,hwif->name,hwgroup)) {
++#if defined(__mc68000__) || defined(CONFIG_BLK_DEV_FALCON_IDE)
++ if (MACH_IS_ATARI && ATARIHW_PRESENT(IDE)) {
++ printk("ide-probe: not registered IDE interrupt
for Falcon IDE!\n");
++ } else
++#endif
+ goto out_unlink;
++ }
+ }
+
+ /*
+
+Signed-Off-By: [EMAIL PROTECTED]
Modified: dists/sid/linux-2.6/debian/patches/series/9-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/9-extra (original)
+++ dists/sid/linux-2.6/debian/patches/series/9-extra Tue Jan 2 21:30:32 2007
@@ -9,3 +9,4 @@
+ m68k-atari-scsi2.patch m68k
+ m68k-mac-mace.patch m68k
+ m68k-mac-cuda.patch m68k
++ m68k-atari-ide.patch m68k
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
