[PATCH] M68k update (part 23)

The old form of designated initializers are obsolete: we need to replace them
with the ISO C forms before 2.6.  Gcc has always supported both forms anyway.

(from Rusty Russell <rusty@rustcorp.com.au>, with some mods by me)

arch/m68k/amiga/config.c

@@ -110,9 +110,9 @@ static void amiga_heartbeat(int on);
 #endif
 
 static struct console amiga_console_driver = {
-	name:		"debug",
-	flags:		CON_PRINTBUFFER,
-	index:		-1,
+	.name =		"debug",
+	.flags =	CON_PRINTBUFFER,
+	.index =	-1,
 };
 
 #ifdef CONFIG_MAGIC_SYSRQ
@@ -137,10 +137,10 @@ extern void (*kd_mksound)(unsigned int, unsigned int);
 static struct {
     struct resource _ciab, _ciaa, _custom, _kickstart;
 } mb_resources = {
-    _ciab:	{ "CIA B", 0x00bfd000, 0x00bfdfff },
-    _ciaa:	{ "CIA A", 0x00bfe000, 0x00bfefff },
-    _custom:	{ "Custom I/O", 0x00dff000, 0x00dfffff },
-    _kickstart:	{ "Kickstart ROM", 0x00f80000, 0x00ffffff }
+    ._ciab =		{ "CIA B", 0x00bfd000, 0x00bfdfff },
+    ._ciaa =		{ "CIA A", 0x00bfe000, 0x00bfefff },
+    ._custom =		{ "Custom I/O", 0x00dff000, 0x00dfffff },
+    ._kickstart =	{ "Kickstart ROM", 0x00f80000, 0x00ffffff }
 };
 
 static struct resource rtc_resource = {

arch/m68k/atari/debug.c

@@ -31,9 +31,9 @@ int atari_SCC_init_done = 0;
 int atari_SCC_reset_done = 0;
 
 static struct console atari_console_driver = {
-	name:		"debug",
-	flags:		CON_PRINTBUFFER,
-	index:		-1,
+	.name =		"debug",
+	.flags =	CON_PRINTBUFFER,
+	.index =	-1,
 };
 
 

arch/m68k/atari/hades-pci.c

@@ -334,12 +334,12 @@ static void __init hades_conf_device(unsigned char bus, unsigned char device_fn)
 }
 
 static struct pci_ops hades_pci_ops = {
-	read_byte:	hades_read_config_byte
-	read_word:	hades_read_config_word
-	read_dword:	hades_read_config_dword
-	write_byte:	hades_write_config_byte
-	write_word:	hades_write_config_word
-	write_dword:	hades_write_config_dword
+	.read_byte =	hades_read_config_byte,
+	.read_word =	hades_read_config_word,
+	.read_dword =	hades_read_config_dword,
+	.write_byte =	hades_write_config_byte,
+	.write_word =	hades_write_config_word,
+	.write_dword =	hades_write_config_dword
 };
 
 /*

arch/m68k/atari/joystick.c

@@ -120,11 +120,11 @@ static unsigned int joystick_poll(struct file *file, poll_table *wait)
 }
 
 struct file_operations atari_joystick_fops = {
-	read:		read_joystick,
-	write:		write_joystick,
-	poll:		joystick_poll,
-	open:		open_joystick,
-	release:	release_joystick,
+	.read =		read_joystick,
+	.write =	write_joystick,
+	.poll =		joystick_poll,
+	.open =		open_joystick,
+	.release =	release_joystick,
 };
 
 int __init atari_joystick_init(void)

arch/m68k/atari/stram.c

@@ -1044,8 +1044,8 @@ static int stram_release( struct inode *inode, struct file *filp )
 
 
 static struct block_device_operations stram_fops = {
-	open:		stram_open,
-	release:	stram_release,
+	.open =		stram_open,
+	.release =	stram_release,
 };
 
 int __init stram_device_init(void)

arch/m68k/bvme6000/rtc.c

@@ -161,9 +161,9 @@ static int rtc_release(struct inode *inode, struct file *file)
  */
 
 static struct file_operations rtc_fops = {
-	ioctl:		rtc_ioctl,
-	open:		rtc_open,
-	release:	rtc_release,
+	.ioctl =	rtc_ioctl,
+	.open =		rtc_open,
+	.release =	rtc_release,
 };
 
 static struct miscdevice rtc_dev=

arch/m68k/kernel/setup.c

@@ -506,10 +506,10 @@ static void c_stop(struct seq_file *m, void *v)
 {
 }
 struct seq_operations cpuinfo_op = {
-	start:	c_start,
-	next:	c_next,
-	stop:	c_stop,
-	show:	show_cpuinfo,
+	.start =	c_start,
+	.next =		c_next,
+	.stop =		c_stop,
+	.show =		show_cpuinfo,
 };
 
 int get_hardware_list(char *buffer)

arch/m68k/mac/debug.c

@@ -159,9 +159,9 @@ int mac_SCC_reset_done = 0;
 static int scc_port = -1;
 
 static struct console mac_console_driver = {
-	name:		"debug",
-	flags:		CON_PRINTBUFFER,
-	index:		-1,
+	.name =		"debug",
+	.flags =	CON_PRINTBUFFER,
+	.index =	-1,
 };
 
 /*

arch/m68k/mvme16x/rtc.c

@@ -150,9 +150,9 @@ static int rtc_release(struct inode *inode, struct file *file)
  */
 
 static struct file_operations rtc_fops = {
-	ioctl:		rtc_ioctl,
-	open:		rtc_open,
-	release:	rtc_release,
+	.ioctl =	rtc_ioctl,
+	.open =		rtc_open,
+	.release =	rtc_release,
 };
 
 static struct miscdevice rtc_dev=

arch/m68k/q40/config.c

@@ -72,9 +72,9 @@ static void q40_mem_console_write(struct console *co, const char *b,
 extern int ql_ticks;
 
 static struct console q40_console_driver = {
-	name:		"debug",
-	flags:		CON_PRINTBUFFER,
-	index:		-1,
+	.name =		"debug",
+	.flags =	CON_PRINTBUFFER,
+	.index =	-1,
 };