Commit 83ae20c8 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bartlomiej Zolnierkiewicz
Browse files

[PATCH] ide: move CONFIG_IDE_MAX_HWIFS into linux/ide.h



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

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 4349d5cd
...@@ -15,10 +15,6 @@ ...@@ -15,10 +15,6 @@
#include <linux/config.h> #include <linux/config.h>
#ifndef MAX_HWIFS
#define MAX_HWIFS CONFIG_IDE_MAX_HWIFS
#endif
#define IDE_ARCH_OBSOLETE_DEFAULTS #define IDE_ARCH_OBSOLETE_DEFAULTS
static inline int ide_default_irq(unsigned long base) static inline int ide_default_irq(unsigned long base)
......
...@@ -16,10 +16,6 @@ ...@@ -16,10 +16,6 @@
#include <linux/config.h> #include <linux/config.h>
#ifndef MAX_HWIFS
#define MAX_HWIFS CONFIG_IDE_MAX_HWIFS
#endif
#define ide_default_io_ctl(base) (0) #define ide_default_io_ctl(base) (0)
#include <asm-generic/ide_iops.h> #include <asm-generic/ide_iops.h>
......
...@@ -17,10 +17,6 @@ ...@@ -17,10 +17,6 @@
#include <linux/config.h> #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 /* Without this, the initialisation of PCI IDE cards end up calling
* ide_init_hwif_ports, which won't work. */ * ide_init_hwif_ports, which won't work. */
#ifdef CONFIG_BLK_DEV_IDEPCI #ifdef CONFIG_BLK_DEV_IDEPCI
......
...@@ -267,6 +267,10 @@ static inline void ide_std_init_ports(hw_regs_t *hw, ...@@ -267,6 +267,10 @@ static inline void ide_std_init_ports(hw_regs_t *hw,
#include <asm/ide.h> #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 */ /* needed on alpha, x86/x86_64, ia64, mips, ppc32 and sh */
#ifndef IDE_ARCH_OBSOLETE_DEFAULTS #ifndef IDE_ARCH_OBSOLETE_DEFAULTS
# define ide_default_io_base(index) (0) # define ide_default_io_base(index) (0)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment