Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks

[cascardo/linux.git] / include / linux / if.h

diff --git a/include/linux/if.h b/include/linux/if.h
index 5c9d1fa..6524684 100644 (file)
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -24,6 +24,7 @@
 #include <linux/compiler.h>            /* for "__user" et al           */
 
 #define        IFNAMSIZ        16
+#define        IFALIASZ        256
 #include <linux/hdlc/ioctl.h>
 
 /* Standard interface flags (netdevice->flags). */