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

[linux-2.6] / include / asm-parisc / processor.h

diff --git a/include/asm-parisc/processor.h b/include/asm-parisc/processor.h
index aae40e8c3aa85693d807c6fb92069f5efaee4d8b..ca49dc91f4fca86bff592f5336ab4265a80ca497 100644 (file)
--- a/include/asm-parisc/processor.h
+++ b/include/asm-parisc/processor.h
@@ -9,7 +9,6 @@
 #define __ASM_PARISC_PROCESSOR_H
 
 #ifndef __ASSEMBLY__
-#include <linux/config.h>
 #include <linux/threads.h>
 #include <linux/spinlock_types.h>
 
@@ -144,16 +143,16 @@ struct thread_struct {
         })
 
 #define INIT_THREAD { \
-       regs:   {       gr: { 0, }, \
-                       fr: { 0, }, \
-                       sr: { 0, }, \
-                       iasq: { 0, }, \
-                       iaoq: { 0, }, \
-                       cr27: 0, \
+       .regs = {       .gr     = { 0, }, \
+                       .fr     = { 0, }, \
+                       .sr     = { 0, }, \
+                       .iasq   = { 0, }, \
+                       .iaoq   = { 0, }, \
+                       .cr27   = 0, \
                }, \
-       task_size:      DEFAULT_TASK_SIZE, \
-       map_base:       DEFAULT_MAP_BASE, \
-       flags:          0 \
+       .task_size      = DEFAULT_TASK_SIZE, \
+       .map_base       = DEFAULT_MAP_BASE, \
+       .flags          = 0 \
        }
 
 /*