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

[Christian T. Steigies]

Author: cts
Date: Tue Jan 16 08:38:55 2007
New Revision: 8191

Modified:
   dists/sid/linux-2.6/debian/arch/m68k/config.mac
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/m68k-atari-ide.patch
   dists/sid/linux-2.6/debian/patches/series/9-extra
Log:
fix atari-ide patch


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	Tue Jan 16 08:38:55 2007
@@ -39,7 +39,7 @@
 CONFIG_SCSI_MAC_ESP=y
 CONFIG_ADB=y
 # switched off the next four CONFIG_ADB_* as requested by Finn Thain
-CONFIG_ADB_MACII=n
+CONFIG_ADB_MACII=y
 CONFIG_ADB_MACIISI=n
 CONFIG_ADB_IOP=n
 CONFIG_ADB_PMU68K=n

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 16 08:38:55 2007
@@ -79,6 +79,7 @@
   * m68k/atari: fixes for ide driver by Michael Schmitz
   * m68k/atari: fixes for ide driver by Michael Schmitz
   * m68k/atari: fixes for ethernec and atakeyb driver by Michael Schmitz, build ethernec as module
+  * m68k/mac: fixes for mace and adb driver by Finn Thain
 
   [ maximilian attems ]
   * Add stable release 2.6.18.6:

Modified: dists/sid/linux-2.6/debian/patches/m68k-atari-ide.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/m68k-atari-ide.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/m68k-atari-ide.patch	Tue Jan 16 08:38:55 2007
@@ -10,7 +10,7 @@
 
 -		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 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

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 16 08:38:55 2007
@@ -13,3 +13,5 @@
 + m68k-atari-ethernec-update.patch m68k
 + m68k-atari-atakeyb-switches.patch m68k
 + bugfix/i386-net-tulip-rm-dup-pci-ids.patch i386
++ m68k-mac-adb.patch m68k
++ m68k-mac-mace-fix.patch m68k