Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 12151
b: refs/heads/master
c: bbc5b21
h: refs/heads/master
i:
  12149: ce8d4f3
  12147: 2d7bc2c
  12143: f455d82
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed Nov 2, 2005
1 parent a8dd780 commit 1601b2d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d8762748cae4f85b3201c0304969d993b42d5258
refs/heads/master: bbc5b21284318a7c981afa85fc4f51c1256eedec
9 changes: 5 additions & 4 deletions trunk/arch/um/include/net_kern.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/char/tpm/tpm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 2 additions & 0 deletions trunk/include/asm-ppc/mv64x60.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 1601b2d

Please sign in to comment.