From 0a216f3d40239d6313958b5fd1692364b80a5a4e Mon Sep 17 00:00:00 2001
From: Alexander Shiyan <shc_work@mail.ru>
Date: Mon, 3 Dec 2012 22:23:32 +0400
Subject: [PATCH] --- yaml --- r: 354784 b: refs/heads/master c:
 463dcc42e4832150eb3de804682b924f9b73a91a h: refs/heads/master v: v3

---
 [refs]                                                        | 2 +-
 trunk/arch/mips/sni/a20r.c                                    | 2 +-
 trunk/drivers/tty/serial/sccnxp.c                             | 2 +-
 .../include/linux/platform_data/{sccnxp.h => serial-sccnxp.h} | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename trunk/include/linux/platform_data/{sccnxp.h => serial-sccnxp.h} (96%)

diff --git a/[refs] b/[refs]
index d490c21793cd..08b63f4df82d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec063899b7b308019afa9f5eb32f0a58a6c6ee53
+refs/heads/master: 463dcc42e4832150eb3de804682b924f9b73a91a
diff --git a/trunk/arch/mips/sni/a20r.c b/trunk/arch/mips/sni/a20r.c
index 9cb9d43a3a0e..e05ad4da44d9 100644
--- a/trunk/arch/mips/sni/a20r.c
+++ b/trunk/arch/mips/sni/a20r.c
@@ -118,7 +118,7 @@ static struct resource sc26xx_rsrc[] = {
 	}
 };
 
-#include <linux/platform_data/sccnxp.h>
+#include <linux/platform_data/serial-sccnxp.h>
 
 static struct sccnxp_pdata sccnxp_data = {
 	.reg_shift	= 2,
diff --git a/trunk/drivers/tty/serial/sccnxp.c b/trunk/drivers/tty/serial/sccnxp.c
index 3a4c57e6ea1e..c864353352c5 100644
--- a/trunk/drivers/tty/serial/sccnxp.c
+++ b/trunk/drivers/tty/serial/sccnxp.c
@@ -25,7 +25,7 @@
 #include <linux/tty_flip.h>
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
-#include <linux/platform_data/sccnxp.h>
+#include <linux/platform_data/serial-sccnxp.h>
 
 #define SCCNXP_NAME			"uart-sccnxp"
 #define SCCNXP_MAJOR			204
diff --git a/trunk/include/linux/platform_data/sccnxp.h b/trunk/include/linux/platform_data/serial-sccnxp.h
similarity index 96%
rename from trunk/include/linux/platform_data/sccnxp.h
rename to trunk/include/linux/platform_data/serial-sccnxp.h
index 096de90cf848..215574d1e81d 100644
--- a/trunk/include/linux/platform_data/sccnxp.h
+++ b/trunk/include/linux/platform_data/serial-sccnxp.h
@@ -11,8 +11,8 @@
  *  (at your option) any later version.
  */
 
-#ifndef __SCCNXP_H
-#define __SCCNXP_H
+#ifndef _PLATFORM_DATA_SERIAL_SCCNXP_H_
+#define _PLATFORM_DATA_SERIAL_SCCNXP_H_
 
 #define SCCNXP_MAX_UARTS	2