diff options
-rw-r--r-- | drivers/ata/pata_samsung_cf.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_samsung_cf.h (renamed from arch/arm/plat-samsung/include/plat/regs-ata.h) | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c index 898e544a7ae8..e04d70b7ce76 100644 --- a/drivers/ata/pata_samsung_cf.c +++ b/drivers/ata/pata_samsung_cf.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
25 | 25 | ||
26 | #include <linux/platform_data/ata-samsung_cf.h> | 26 | #include <linux/platform_data/ata-samsung_cf.h> |
27 | #include <plat/regs-ata.h> | 27 | #include "pata_samsung_cf.h" |
28 | 28 | ||
29 | #define DRV_NAME "pata_samsung_cf" | 29 | #define DRV_NAME "pata_samsung_cf" |
30 | #define DRV_VERSION "0.1" | 30 | #define DRV_VERSION "0.1" |
diff --git a/arch/arm/plat-samsung/include/plat/regs-ata.h b/drivers/ata/pata_samsung_cf.h index f5df92fdae26..eeefe2e0cdc6 100644 --- a/arch/arm/plat-samsung/include/plat/regs-ata.h +++ b/drivers/ata/pata_samsung_cf.h | |||
@@ -1,5 +1,4 @@ | |||
1 | /* linux/arch/arm/plat-samsung/include/plat/regs-ata.h | 1 | /* |
2 | * | ||
3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | 2 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. |
4 | * http://www.samsung.com | 3 | * http://www.samsung.com |
5 | * | 4 | * |
@@ -10,8 +9,8 @@ | |||
10 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
11 | */ | 10 | */ |
12 | 11 | ||
13 | #ifndef __ASM_PLAT_REGS_ATA_H | 12 | #ifndef __PATA_SAMSUNG_CF_H |
14 | #define __ASM_PLAT_REGS_ATA_H __FILE__ | 13 | #define __PATA_SAMSUNG_CF_H |
15 | 14 | ||
16 | #define S3C_CFATA_REG(x) (x) | 15 | #define S3C_CFATA_REG(x) (x) |
17 | 16 | ||
@@ -53,4 +52,4 @@ | |||
53 | #define S3C_ATA_CFG_SWAP 0x40 | 52 | #define S3C_ATA_CFG_SWAP 0x40 |
54 | #define S3C_ATA_CFG_IORDYEN 0x02 | 53 | #define S3C_ATA_CFG_IORDYEN 0x02 |
55 | 54 | ||
56 | #endif /* __ASM_PLAT_REGS_ATA_H */ | 55 | #endif /* __PATA_SAMSUNG_CF_H */ |