lkml.org 
[lkml]   [2005]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] IDE: move CONFIG_IDE_MAX_HWIFS into linux/ide.h (resend)
Date
Ping...  any objection to this?


CONFIG_IDE_MAX_HWIFS is a generic thing, no need to have it duplicated
by every arch that uses it.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>

Index: work-ide/include/asm-alpha/ide.h
===================================================================
--- work-ide.orig/include/asm-alpha/ide.h 2005-08-24 09:36:41.000000000 -0600
+++ work-ide/include/asm-alpha/ide.h 2005-08-24 09:37:12.000000000 -0600
@@ -15,10 +15,6 @@

#include <linux/config.h>

-#ifndef MAX_HWIFS
-#define MAX_HWIFS CONFIG_IDE_MAX_HWIFS
-#endif
-
#define IDE_ARCH_OBSOLETE_DEFAULTS

static inline int ide_default_irq(unsigned long base)
Index: work-ide/include/asm-sh/ide.h
===================================================================
--- work-ide.orig/include/asm-sh/ide.h 2005-08-24 09:36:41.000000000 -0600
+++ work-ide/include/asm-sh/ide.h 2005-08-24 09:37:12.000000000 -0600
@@ -16,10 +16,6 @@

#include <linux/config.h>

-#ifndef MAX_HWIFS
-#define MAX_HWIFS CONFIG_IDE_MAX_HWIFS
-#endif
-
#define ide_default_io_ctl(base) (0)

#include <asm-generic/ide_iops.h>
Index: work-ide/include/asm-sh64/ide.h
===================================================================
--- work-ide.orig/include/asm-sh64/ide.h 2005-08-24 09:36:41.000000000 -0600
+++ work-ide/include/asm-sh64/ide.h 2005-08-24 09:37:12.000000000 -0600
@@ -17,10 +17,6 @@

#include <linux/config.h>

-#ifndef MAX_HWIFS
-#define MAX_HWIFS CONFIG_IDE_MAX_HWIFS
-#endif
-
/* Without this, the initialisation of PCI IDE cards end up calling
* ide_init_hwif_ports, which won't work. */
#ifdef CONFIG_BLK_DEV_IDEPCI
Index: work-ide/include/linux/ide.h
===================================================================
--- work-ide.orig/include/linux/ide.h 2005-08-24 09:37:03.000000000 -0600
+++ work-ide/include/linux/ide.h 2005-08-24 09:37:24.000000000 -0600
@@ -266,6 +266,10 @@

#include <asm/ide.h>

+#ifndef MAX_HWIFS
+#define MAX_HWIFS CONFIG_IDE_MAX_HWIFS
+#endif
+
/* needed on alpha, x86/x86_64, ia64, mips, ppc32 and sh */
#ifndef IDE_ARCH_OBSOLETE_DEFAULTS
# define ide_default_io_base(index) (0)
-
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/
\
 
 \ /
  Last update: 2005-08-30 00:55    [W:0.039 / U:1.568 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site