Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[pandora-kernel.git] / scripts / genksyms / parse.y

diff --git a/scripts/genksyms/parse.y b/scripts/genksyms/parse.y
index ca04c94..10d7dc7 100644 (file)
--- a/scripts/genksyms/parse.y
+++ b/scripts/genksyms/parse.y
@@ -61,6 +61,7 @@ remove_list(struct string_list **pb, struct string_list **pe)
 %token DOUBLE_KEYW
 %token ENUM_KEYW
 %token EXTERN_KEYW
+%token EXTENSION_KEYW
 %token FLOAT_KEYW
 %token INLINE_KEYW
 %token INT_KEYW
@@ -110,7 +111,9 @@ declaration:
        ;
 
 declaration1:
-       TYPEDEF_KEYW { is_typedef = 1; } simple_declaration
+       EXTENSION_KEYW TYPEDEF_KEYW { is_typedef = 1; } simple_declaration
+               { $$ = $4; }
+       | TYPEDEF_KEYW { is_typedef = 1; } simple_declaration
                { $$ = $3; }
        | simple_declaration
        | function_definition
@@ -443,7 +446,7 @@ member_bitfield_declarator:
 
 attribute_opt:
        /* empty */                                     { $$ = NULL; }
-       | ATTRIBUTE_PHRASE
+       | attribute_opt ATTRIBUTE_PHRASE
        ;
 
 asm_definition: