diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-25 23:33:09 +0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-25 23:33:09 +0400 |
| commit | a6d967a485c67ec8a1276261f39d81ace6a3e308 (patch) | |
| tree | 3e46be7f279342316d4578995dfbfce99728c579 | |
| parent | 7c250413e5b7c3dfae89354725b70c76d7621395 (diff) | |
| download | linux-a6d967a485c67ec8a1276261f39d81ace6a3e308.tar.xz | |
[libata] No need for all those arch libata-portmap.h headers
They all contain the same thing. Instead, have a single generic one in
include/asm-generic, and permit an arch to override as needed.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | include/asm-alpha/libata-portmap.h | 1 | ||||
| -rw-r--r-- | include/asm-frv/libata-portmap.h | 1 | ||||
| -rw-r--r-- | include/asm-i386/libata-portmap.h | 1 | ||||
| -rw-r--r-- | include/asm-ia64/libata-portmap.h | 1 | ||||
| -rw-r--r-- | include/asm-powerpc/libata-portmap.h | 1 | ||||
| -rw-r--r-- | include/asm-sparc/libata-portmap.h | 1 | ||||
| -rw-r--r-- | include/asm-sparc64/libata-portmap.h | 1 | ||||
| -rw-r--r-- | include/asm-x86_64/libata-portmap.h | 1 | ||||
| -rw-r--r-- | include/linux/libata.h | 8 |
9 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-alpha/libata-portmap.h b/include/asm-alpha/libata-portmap.h deleted file mode 100644 index 75484ef0c743..000000000000 --- a/include/asm-alpha/libata-portmap.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/libata-portmap.h> diff --git a/include/asm-frv/libata-portmap.h b/include/asm-frv/libata-portmap.h deleted file mode 100644 index 75484ef0c743..000000000000 --- a/include/asm-frv/libata-portmap.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/libata-portmap.h> diff --git a/include/asm-i386/libata-portmap.h b/include/asm-i386/libata-portmap.h deleted file mode 100644 index 75484ef0c743..000000000000 --- a/include/asm-i386/libata-portmap.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/libata-portmap.h> diff --git a/include/asm-ia64/libata-portmap.h b/include/asm-ia64/libata-portmap.h deleted file mode 100644 index 75484ef0c743..000000000000 --- a/include/asm-ia64/libata-portmap.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/libata-portmap.h> diff --git a/include/asm-powerpc/libata-portmap.h b/include/asm-powerpc/libata-portmap.h deleted file mode 100644 index 75484ef0c743..000000000000 --- a/include/asm-powerpc/libata-portmap.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/libata-portmap.h> diff --git a/include/asm-sparc/libata-portmap.h b/include/asm-sparc/libata-portmap.h deleted file mode 100644 index 75484ef0c743..000000000000 --- a/include/asm-sparc/libata-portmap.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/libata-portmap.h> diff --git a/include/asm-sparc64/libata-portmap.h b/include/asm-sparc64/libata-portmap.h deleted file mode 100644 index 75484ef0c743..000000000000 --- a/include/asm-sparc64/libata-portmap.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/libata-portmap.h> diff --git a/include/asm-x86_64/libata-portmap.h b/include/asm-x86_64/libata-portmap.h deleted file mode 100644 index 75484ef0c743..000000000000 --- a/include/asm-x86_64/libata-portmap.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/libata-portmap.h> diff --git a/include/linux/libata.h b/include/linux/libata.h index 1ef3d3901b47..d6a3d4b345fc 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -36,7 +36,15 @@ #include <linux/workqueue.h> #include <scsi/scsi_host.h> +/* + * Define if arch has non-standard setup. This is a _PCI_ standard + * not a legacy or ISA standard. + */ +#ifdef CONFIG_ATA_NONSTANDARD #include <asm/libata-portmap.h> +#else +#include <asm-generic/libata-portmap.h> +#endif /* * compile-time options: to be removed as soon as all the drivers are |