---

yaml --- r: 354784 b: refs/heads/master c: 463dcc4 h: refs/heads/master v: v3
git-mirror · Jan 16, 2013 · 0a216f3 · 0a216f3
1 parent a465441
commit 0a216f3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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 → ...clude/linux/platform_data/serial-sccnxp.h b/trunk/include/linux/platform_data/sccnxp.h → ...clude/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