diff options
-rw-r--r-- | arch/um/include/net_kern.h | 9 | ||||
-rw-r--r-- | drivers/char/tpm/tpm.h | 1 | ||||
-rw-r--r-- | include/asm-ppc/mv64x60.h | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/arch/um/include/net_kern.h b/arch/um/include/net_kern.h index 1c07949a13d6..f7de6df60dd7 100644 --- a/arch/um/include/net_kern.h +++ b/arch/um/include/net_kern.h | |||
@@ -6,10 +6,11 @@ | |||
6 | #ifndef __UM_NET_KERN_H | 6 | #ifndef __UM_NET_KERN_H |
7 | #define __UM_NET_KERN_H | 7 | #define __UM_NET_KERN_H |
8 | 8 | ||
9 | #include "linux/netdevice.h" | 9 | #include <linux/netdevice.h> |
10 | #include "linux/skbuff.h" | 10 | #include <linux/platform_device.h> |
11 | #include "linux/socket.h" | 11 | #include <linux/skbuff.h> |
12 | #include "linux/list.h" | 12 | #include <linux/socket.h> |
13 | #include <linux/list.h> | ||
13 | 14 | ||
14 | struct uml_net { | 15 | struct uml_net { |
15 | struct list_head list; | 16 | struct list_head list; |
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 024814b50c3c..99a60496ecc6 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
25 | #include <linux/fs.h> | 25 | #include <linux/fs.h> |
26 | #include <linux/miscdevice.h> | 26 | #include <linux/miscdevice.h> |
27 | #include <linux/platform_device.h> | ||
27 | 28 | ||
28 | enum tpm_timeout { | 29 | enum tpm_timeout { |
29 | TPM_TIMEOUT = 5, /* msecs */ | 30 | TPM_TIMEOUT = 5, /* msecs */ |
diff --git a/include/asm-ppc/mv64x60.h b/include/asm-ppc/mv64x60.h index ee2f9188cc64..4f2405b83612 100644 --- a/include/asm-ppc/mv64x60.h +++ b/include/asm-ppc/mv64x60.h | |||
@@ -27,6 +27,8 @@ | |||
27 | #include <asm/pci-bridge.h> | 27 | #include <asm/pci-bridge.h> |
28 | #include <asm/mv64x60_defs.h> | 28 | #include <asm/mv64x60_defs.h> |
29 | 29 | ||
30 | struct platform_device; | ||
31 | |||
30 | extern u8 mv64x60_pci_exclude_bridge; | 32 | extern u8 mv64x60_pci_exclude_bridge; |
31 | 33 | ||
32 | extern spinlock_t mv64x60_lock; | 34 | extern spinlock_t mv64x60_lock; |