Merge branch 'origin'

[~andy/linux] / include / asm-um / ldt-i386.h

diff --git a/include/asm-um/ldt-i386.h b/include/asm-um/ldt-i386.h
index b42662929b6c04b9980d1607b5856d609976ca7b..175722a9116478545c8d8c90da1b8f92fe0fe9f5 100644 (file)
--- a/include/asm-um/ldt-i386.h
+++ b/include/asm-um/ldt-i386.h
@@ -35,7 +35,7 @@ typedef struct uml_ldt {
        union {
                struct ldt_entry * pages[LDT_PAGES_MAX];
                struct ldt_entry entries[LDT_DIRECT_ENTRIES];
-       };
+       } u;
 } uml_ldt_t;
 
 /*