diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-09-22 07:49:50 -0700 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-09-22 11:50:29 -0400 |
| commit | dcd3ea81f572fba57d18e91743a525a9787c1f6e (patch) | |
| tree | 114c49721c0724b8873877fb5b52f906c9d34c81 /include | |
| parent | 014b44e7a4683ccef09cc58c53012e5bc53daece (diff) | |
| download | linux-rpi-dcd3ea81f572fba57d18e91743a525a9787c1f6e.tar.gz linux-rpi-dcd3ea81f572fba57d18e91743a525a9787c1f6e.tar.bz2 linux-rpi-dcd3ea81f572fba57d18e91743a525a9787c1f6e.zip | |
libata: remove <asm-generic/libata-portmap.h>
asm-generic is only intended for architecture defaults, and we can simply
kill it off by moving the two defintions directly to <linux/libata.h>.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/libata-portmap.h | 7 | ||||
| -rw-r--r-- | include/linux/libata.h | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/include/asm-generic/libata-portmap.h b/include/asm-generic/libata-portmap.h deleted file mode 100644 index cf14f2ff40b6..000000000000 --- a/include/asm-generic/libata-portmap.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_GENERIC_LIBATA_PORTMAP_H -#define __ASM_GENERIC_LIBATA_PORTMAP_H - -#define ATA_PRIMARY_IRQ(dev) 14 -#define ATA_SECONDARY_IRQ(dev) 15 - -#endif diff --git a/include/linux/libata.h b/include/linux/libata.h index e37d4f99f510..616eef4d81ea 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -46,7 +46,8 @@ #ifdef CONFIG_ATA_NONSTANDARD #include <asm/libata-portmap.h> #else -#include <asm-generic/libata-portmap.h> +#define ATA_PRIMARY_IRQ(dev) 14 +#define ATA_SECONDARY_IRQ(dev) 15 #endif /* |