Merge bk://linux.bkbits.net/linux-2.5

into hostme.bitkeeper.com:/repos/c/cifs/linux-2.5cifs

drivers/ide/ide-probe.c

@@ -390,6 +390,14 @@ static int try_to_identify (ide_drive_t *drive, u8 cmd)
 		cookie = probe_irq_on();
 		/* enable device irq */
 		hwif->OUTB(drive->ctl, IDE_CONTROL_REG);
+	} else {
+		/*
+		 * Disable device irq if we don't need to
+		 * probe for it. Otherwise we'll get spurious
+		 * interrupts during the identify-phase that
+		 * the irq handler isn't expecting.
+		 */
+		hwif->OUTB(drive->ctl|2, IDE_CONTROL_REG);
 	}
 
 	retval = actual_try_to_identify(drive, cmd);

include/linux/compiler.h

@@ -68,7 +68,7 @@
  * The attribute `pure' is not implemented in GCC versions earlier
  * than 2.96.
  */
-#if (__GNUC__ == 2 && __GNUC_MINOR >= 96) || __GNUC__ > 2
+#if (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || __GNUC__ > 2
 #define __attribute_pure__	__attribute__((pure))
 #else
 #define __attribute_pure__	/* unimplemented */