浏览代码

[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>
Jeff Garzik 18 年之前
父节点
当前提交
a6d967a485

+ 0 - 1
include/asm-alpha/libata-portmap.h

@@ -1 +0,0 @@
-#include <asm-generic/libata-portmap.h>

+ 0 - 1
include/asm-frv/libata-portmap.h

@@ -1 +0,0 @@
-#include <asm-generic/libata-portmap.h>

+ 0 - 1
include/asm-i386/libata-portmap.h

@@ -1 +0,0 @@
-#include <asm-generic/libata-portmap.h>

+ 0 - 1
include/asm-ia64/libata-portmap.h

@@ -1 +0,0 @@
-#include <asm-generic/libata-portmap.h>

+ 0 - 1
include/asm-powerpc/libata-portmap.h

@@ -1 +0,0 @@
-#include <asm-generic/libata-portmap.h>

+ 0 - 1
include/asm-sparc/libata-portmap.h

@@ -1 +0,0 @@
-#include <asm-generic/libata-portmap.h>

+ 0 - 1
include/asm-sparc64/libata-portmap.h

@@ -1 +0,0 @@
-#include <asm-generic/libata-portmap.h>

+ 0 - 1
include/asm-x86_64/libata-portmap.h

@@ -1 +0,0 @@
-#include <asm-generic/libata-portmap.h>

+ 8 - 0
include/linux/libata.h

@@ -36,7 +36,15 @@
 #include <linux/workqueue.h>
 #include <linux/workqueue.h>
 #include <scsi/scsi_host.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>
 #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
  * compile-time options: to be removed as soon as all the drivers are