From fc150ae405a3a8b013c5a15433fc6a63d98947d4 Mon Sep 17 00:00:00 2001
From: Huang Weiyi <weiyi.huang@gmail.com>
Date: Tue, 31 Mar 2009 02:41:18 +0000
Subject: [PATCH] --- yaml --- r: 142519 b: refs/heads/master c:
 85701e6ac1b75d983610c24cfdaafdaaf56cfbb2 h: refs/heads/master i:   142517:
 02f26404c063a85e81c7e89609842439eea6b7f9   142515:
 c7c564d2d64181173fca7858de99c00b05efe315   142511:
 30ead2c24e59db25f28988b0d6a7015550aeaa45 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/powerpc/include/asm/ps3fb.h   | 1 -
 trunk/arch/powerpc/kernel/setup-common.c | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c20c7af65a2b..5b2491a12ee6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f08b7e9f551fa74219bf32df483fb95c58aad94b
+refs/heads/master: 85701e6ac1b75d983610c24cfdaafdaaf56cfbb2
diff --git a/trunk/arch/powerpc/include/asm/ps3fb.h b/trunk/arch/powerpc/include/asm/ps3fb.h
index 90dbefb8cfc4..e7233a849680 100644
--- a/trunk/arch/powerpc/include/asm/ps3fb.h
+++ b/trunk/arch/powerpc/include/asm/ps3fb.h
@@ -21,7 +21,6 @@
 
 #include <linux/types.h>
 #include <linux/ioctl.h>
-#include <linux/types.h>
 
 /* ioctl */
 #define PS3FB_IOCTL_SETMODE       _IOW('r',  1, int) /* set video mode */
diff --git a/trunk/arch/powerpc/kernel/setup-common.c b/trunk/arch/powerpc/kernel/setup-common.c
index 9774f9fed96e..02fed27af7f6 100644
--- a/trunk/arch/powerpc/kernel/setup-common.c
+++ b/trunk/arch/powerpc/kernel/setup-common.c
@@ -36,7 +36,6 @@
 #include <linux/percpu.h>
 #include <linux/lmb.h>
 #include <linux/of_platform.h>
-#include <linux/platform_device.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/processor.h>