diff options
author | Huacai Chen <chenhc@lemote.com> | 2015-04-20 22:00:35 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2015-06-21 15:53:59 -0400 |
commit | 30ad29bb48881ee11f5daf30c6fc50292ae08c57 (patch) | |
tree | d899b18a17e6269123ff2795f2e6d832523f1fb9 /drivers/rtc/rtc-ls1x.c | |
parent | abcc82b19fa9b4f41e02f28715005851b580163d (diff) |
MIPS: Loongson: Naming style cleanup and rework
Currently, code of Loongson-2/3 is under loongson directory and code of
Loongson-1 is under loongson1 directory. Besides, there are Kconfig
options such as MACH_LOONGSON and MACH_LOONGSON1. This naming style is
very ugly and confusing. Since Loongson-2/3 are both 64-bit general-
purpose CPU while Loongson-1 is 32-bit SoC, we rename both file names
and Kconfig symbols from loongson/loongson1 to loongson64/loongson32.
[ralf@linux-mips.org: Resolve a number of simple conflicts.]
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Cc: Kelvin Cheung <keguang.zhang@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/9790/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers/rtc/rtc-ls1x.c')
-rw-r--r-- | drivers/rtc/rtc-ls1x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-ls1x.c b/drivers/rtc/rtc-ls1x.c index 8445e564094a..22a9ec4f2b83 100644 --- a/drivers/rtc/rtc-ls1x.c +++ b/drivers/rtc/rtc-ls1x.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
20 | #include <asm/mach-loongson1/loongson1.h> | 20 | #include <loongson1.h> |
21 | 21 | ||
22 | #define LS1X_RTC_REG_OFFSET (LS1X_RTC_BASE + 0x20) | 22 | #define LS1X_RTC_REG_OFFSET (LS1X_RTC_BASE + 0x20) |
23 | #define LS1X_RTC_REGS(x) \ | 23 | #define LS1X_RTC_REGS(x) \ |