diff options
-rw-r--r-- | arch/mips/sni/a20r.c | 2 | ||||
-rw-r--r-- | drivers/tty/serial/sccnxp.c | 2 | ||||
-rw-r--r-- | include/linux/platform_data/serial-sccnxp.h (renamed from include/linux/platform_data/sccnxp.h) | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/sni/a20r.c b/arch/mips/sni/a20r.c index 9cb9d43a3a0e..e05ad4da44d9 100644 --- a/arch/mips/sni/a20r.c +++ b/arch/mips/sni/a20r.c | |||
@@ -118,7 +118,7 @@ static struct resource sc26xx_rsrc[] = { | |||
118 | } | 118 | } |
119 | }; | 119 | }; |
120 | 120 | ||
121 | #include <linux/platform_data/sccnxp.h> | 121 | #include <linux/platform_data/serial-sccnxp.h> |
122 | 122 | ||
123 | static struct sccnxp_pdata sccnxp_data = { | 123 | static struct sccnxp_pdata sccnxp_data = { |
124 | .reg_shift = 2, | 124 | .reg_shift = 2, |
diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c index 3a4c57e6ea1e..c864353352c5 100644 --- a/drivers/tty/serial/sccnxp.c +++ b/drivers/tty/serial/sccnxp.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <linux/tty_flip.h> | 25 | #include <linux/tty_flip.h> |
26 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
27 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
28 | #include <linux/platform_data/sccnxp.h> | 28 | #include <linux/platform_data/serial-sccnxp.h> |
29 | 29 | ||
30 | #define SCCNXP_NAME "uart-sccnxp" | 30 | #define SCCNXP_NAME "uart-sccnxp" |
31 | #define SCCNXP_MAJOR 204 | 31 | #define SCCNXP_MAJOR 204 |
diff --git a/include/linux/platform_data/sccnxp.h b/include/linux/platform_data/serial-sccnxp.h index 096de90cf848..215574d1e81d 100644 --- a/include/linux/platform_data/sccnxp.h +++ b/include/linux/platform_data/serial-sccnxp.h | |||
@@ -11,8 +11,8 @@ | |||
11 | * (at your option) any later version. | 11 | * (at your option) any later version. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #ifndef __SCCNXP_H | 14 | #ifndef _PLATFORM_DATA_SERIAL_SCCNXP_H_ |
15 | #define __SCCNXP_H | 15 | #define _PLATFORM_DATA_SERIAL_SCCNXP_H_ |
16 | 16 | ||
17 | #define SCCNXP_MAX_UARTS 2 | 17 | #define SCCNXP_MAX_UARTS 2 |
18 | 18 | ||