[PATCH][TRIVIAL][RESEND] Remove warning in drivers/ide/ide.c fornon-PCI systems

From: Stephane Ouellette
Date: Fri Aug 15 2003 - 23:30:00 EST


Andre,

the following patches remove a warning if CONFIG_BLK_DEV_IDEPCI is not defined.

Included patches are for 2.4.22-rc1-ac1 and 2.6.0-test2.

Stephane Ouellette

--- linux-2.4.22-rc1-ac1-orig/drivers/ide/ide.c Fri Aug 8 22:34:38 2003
+++ linux-2.4.22-rc1-ac1-fixed/drivers/ide/ide.c Fri Aug 8 23:10:57 2003
@@ -172,7 +172,9 @@
static int system_bus_speed; /* holds what we think is VESA/PCI bus speed */
static int initializing; /* set while initializing built-in drivers */

+#ifdef CONFIG_BLK_DEV_IDEPCI
static int ide_scan_direction; /* THIS was formerly 2.2.x pci=reverse */
+#endif

#ifdef CONFIG_IDEDMA_AUTO
int noautodma = 0;
--- linux-2.6.0-test2-orig/drivers/ide/ide.c 2003-07-27 12:59:39.000000000 -0400
+++ linux-2.6.0-test2-fixed/drivers/ide/ide.c 2003-08-08 23:19:44.000000000 -0400
@@ -180,7 +180,9 @@
DECLARE_MUTEX(ide_cfg_sem);
spinlock_t ide_lock __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED;

+#ifdef CONFIG_BLK_DEV_IDEPCI
static int ide_scan_direction; /* THIS was formerly 2.2.x pci=reverse */
+#endif

#ifdef CONFIG_IDEDMA_AUTO
int noautodma = 0;