projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfs2
[powerpc.git]
/
include
/
linux
/
libata.h
diff --git
a/include/linux/libata.h
b/include/linux/libata.h
index
1ef3d39
..
d6a3d4b
100644
(file)
--- a/
include/linux/libata.h
+++ b/
include/linux/libata.h
@@
-36,7
+36,15
@@
#include <linux/workqueue.h>
#include <scsi/scsi_host.h>
#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>
#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