diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /drivers/ap1000 | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'drivers/ap1000')
| -rw-r--r-- | drivers/ap1000/bif.c | 1 | ||||
| -rw-r--r-- | drivers/ap1000/ringbuf.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ap1000/bif.c b/drivers/ap1000/bif.c index 2cde93a06..08492ca17 100644 --- a/drivers/ap1000/bif.c +++ b/drivers/ap1000/bif.c @@ -30,7 +30,6 @@ #include <asm/io.h> #include <linux/inet.h> -#include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/skbuff.h> #include <net/sock.h> diff --git a/drivers/ap1000/ringbuf.c b/drivers/ap1000/ringbuf.c index 69682437e..49c716732 100644 --- a/drivers/ap1000/ringbuf.c +++ b/drivers/ap1000/ringbuf.c @@ -318,6 +318,7 @@ struct inode_operations proc_ringbuf_inode_operations = { NULL, /* mknod */ NULL, /* rename */ NULL, /* readlink */ + NULL, /* follow_link */ NULL, /* get_block */ NULL, /* readpage */ NULL, /* writepage */ |