Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/include/linux/isdnif.h b/include/linux/isdnif.h
index 04e10f9..b8c23f8 100644 (file)
--- a/include/linux/isdnif.h
+++ b/include/linux/isdnif.h
@@ -54,7 +54,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 #include <linux/skbuff.h>
 
 /***************************************************************************/
@@ -318,7 +317,7 @@ typedef struct T30_s {
        __u8 r_scantime;
        __u8 r_id[FAXIDLEN];
        __u8 r_code;
-} __attribute__((packed)) T30_s;
+} __packed T30_s;
 
 #define ISDN_TTY_FAX_CONN_IN   0
 #define ISDN_TTY_FAX_CONN_OUT  1