diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/ide/ide-floppy.c linux.22-pre5-ac1/drivers/ide/ide-floppy.c
--- linux.22-pre5/drivers/ide/ide-floppy.c 2003-07-14 12:26:52.000000000 +0100
+++ linux.22-pre5-ac1/drivers/ide/ide-floppy.c 2003-07-09 13:24:26.000000000 +0100
@@ -2195,7 +2195,6 @@
idefloppy_floppy_t *floppy;
int failed = 0;
- printk(KERN_INFO "ide-floppy driver " IDEFLOPPY_VERSION "\n");
#endif /* CLASSIC_BUILTINS_METHOD */
MOD_INC_USE_COUNT;
#ifdef CLASSIC_BUILTINS_METHOD
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.22-pre5/drivers/ide/setup-pci.c linux.22-pre5-ac1/drivers/ide/setup-pci.c
--- linux.22-pre5/drivers/ide/setup-pci.c 2003-07-14 12:27:36.000000000 +0100
+++ linux.22-pre5-ac1/drivers/ide/setup-pci.c 2003-07-09 13:02:14.000000000 +0100
@@ -172,7 +172,7 @@
* is already in DMA mode we check and enforce IDE simplex rules.
*/
-static unsigned long __init ide_get_or_set_dma_base (ide_hwif_t *hwif)
+static unsigned long ide_get_or_set_dma_base (ide_hwif_t *hwif)
{
unsigned long dma_base = 0;
struct pci_dev *dev = hwif->pci_dev;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Tue Jul 15 2003 - 22:00:51 EST