Merge branches 'armv7', 'at91', 'misc' and 'omap' into devel

[linux-2.6] / fs / afs / internal.h

diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index 3363e311a2f7d07bfcfc937d3ab48e1891db9e31..d90c158cd9346d46c0abbb9dd01dcacf6b1c30f2 100644 (file)
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@ -349,7 +349,6 @@ struct afs_permits {
  * record of one of a system's set of network interfaces
  */
 struct afs_interface {
-       unsigned        index;          /* interface index */
        struct in_addr  address;        /* IPv4 address bound to interface */
        struct in_addr  netmask;        /* netmask applied to address */
        unsigned        mtu;            /* MTU of interface */
@@ -564,7 +563,7 @@ extern void afs_fs_exit(void);
  * use-rtnetlink.c
  */
 extern int afs_get_ipv4_interfaces(struct afs_interface *, size_t, bool);
-extern int afs_get_MAC_address(u8 [6]);
+extern int afs_get_MAC_address(u8 *, size_t);
 
 /*
  * vlclient.c