From 1601b2d7d873b09dcca7896f53bc4ffd5de051e9 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Tue, 1 Nov 2005 15:14:05 +0000
Subject: [PATCH] --- yaml --- r: 12151 b: refs/heads/master c:
 bbc5b21284318a7c981afa85fc4f51c1256eedec h: refs/heads/master i:   12149:
 ce8d4f385b6ea701cb633a17c64a6099217d2c55   12147:
 2d7bc2c4e512baa56190d5d1cf2cbc07557dd993   12143:
 f455d82a85180ae73fa6c4427d159b8798555e9a v: v3

---
 [refs]                           | 2 +-
 trunk/arch/um/include/net_kern.h | 9 +++++----
 trunk/drivers/char/tpm/tpm.h     | 1 +
 trunk/include/asm-ppc/mv64x60.h  | 2 ++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1260da1f53df..f94f1efd562f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8762748cae4f85b3201c0304969d993b42d5258
+refs/heads/master: bbc5b21284318a7c981afa85fc4f51c1256eedec
diff --git a/trunk/arch/um/include/net_kern.h b/trunk/arch/um/include/net_kern.h
index 1c07949a13d6..f7de6df60dd7 100644
--- a/trunk/arch/um/include/net_kern.h
+++ b/trunk/arch/um/include/net_kern.h
@@ -6,10 +6,11 @@
 #ifndef __UM_NET_KERN_H
 #define __UM_NET_KERN_H
 
-#include "linux/netdevice.h"
-#include "linux/skbuff.h"
-#include "linux/socket.h"
-#include "linux/list.h"
+#include <linux/netdevice.h>
+#include <linux/platform_device.h>
+#include <linux/skbuff.h>
+#include <linux/socket.h>
+#include <linux/list.h>
 
 struct uml_net {
 	struct list_head list;
diff --git a/trunk/drivers/char/tpm/tpm.h b/trunk/drivers/char/tpm/tpm.h
index 024814b50c3c..99a60496ecc6 100644
--- a/trunk/drivers/char/tpm/tpm.h
+++ b/trunk/drivers/char/tpm/tpm.h
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
+#include <linux/platform_device.h>
 
 enum tpm_timeout {
 	TPM_TIMEOUT = 5,	/* msecs */
diff --git a/trunk/include/asm-ppc/mv64x60.h b/trunk/include/asm-ppc/mv64x60.h
index ee2f9188cc64..4f2405b83612 100644
--- a/trunk/include/asm-ppc/mv64x60.h
+++ b/trunk/include/asm-ppc/mv64x60.h
@@ -27,6 +27,8 @@
 #include <asm/pci-bridge.h>
 #include <asm/mv64x60_defs.h>
 
+struct platform_device;
+
 extern u8	mv64x60_pci_exclude_bridge;
 
 extern spinlock_t mv64x60_lock;