1 diff -aur linux.backup/drivers/char/lcd.c linux/drivers/char/lcd.c
2 --- linux.backup/drivers/char/lcd.c Mon Jul 21 23:34:54 2003
3 +++ linux/drivers/char/lcd.c Sat Aug 16 15:45:01 2003
7 static struct file_operations lcd_fops = {
16 static struct miscdevice lcd_dev=
17 diff -aur linux.backup/drivers/i2c/i2c-keywest.c linux/drivers/i2c/i2c-keywest.c
18 --- linux.backup/drivers/i2c/i2c-keywest.c Sat Aug 16 15:02:44 2003
19 +++ linux/drivers/i2c/i2c-keywest.c Sat Aug 16 18:15:45 2003
22 /* For now, we only handle combined mode (smbus) */
23 static struct i2c_algorithm keywest_algorithm = {
24 - name: "Keywest i2c",
26 - smbus_xfer: keywest_smbus_xfer,
27 - master_xfer: keywest_xfer,
28 - functionality: keywest_func,
29 + .name = "Keywest i2c",
30 + .id = I2C_ALGO_SMBUS,
31 + .smbus_xfer = keywest_smbus_xfer,
32 + .master_xfer = keywest_xfer,
33 + .functionality = keywest_func,
37 diff -aur linux.backup/drivers/media/common/saa7146_video.c linux/drivers/media/common/saa7146_video.c
38 --- linux.backup/drivers/media/common/saa7146_video.c Sat Aug 16 15:02:45 2003
39 +++ linux/drivers/media/common/saa7146_video.c Sat Aug 16 18:16:29 2003
42 static struct v4l2_queryctrl controls[] = {
44 - id: V4L2_CID_BRIGHTNESS,
50 - type: V4L2_CTRL_TYPE_INTEGER,
51 + .id = V4L2_CID_BRIGHTNESS,
52 + .name = "Brightness",
56 + .default_value = 128,
57 + .type = V4L2_CTRL_TYPE_INTEGER,
59 - id: V4L2_CID_CONTRAST,
65 - type: V4L2_CTRL_TYPE_INTEGER,
66 + .id = V4L2_CID_CONTRAST,
71 + .default_value = 64,
72 + .type = V4L2_CTRL_TYPE_INTEGER,
74 - id: V4L2_CID_SATURATION,
80 - type: V4L2_CTRL_TYPE_INTEGER,
81 + .id = V4L2_CID_SATURATION,
82 + .name = "Saturation",
86 + .default_value = 64,
87 + .type = V4L2_CTRL_TYPE_INTEGER,
90 - name: "Vertical flip",
93 - type: V4L2_CTRL_TYPE_BOOLEAN,
94 + .id = V4L2_CID_VFLIP,
95 + .name = "Vertical flip",
98 + .type = V4L2_CTRL_TYPE_BOOLEAN,
100 - id: V4L2_CID_HFLIP,
101 - name: "Horizontal flip",
104 - type: V4L2_CTRL_TYPE_BOOLEAN,
105 + .id = V4L2_CID_HFLIP,
106 + .name = "Horizontal flip",
109 + .type = V4L2_CTRL_TYPE_BOOLEAN,
112 static int NUM_CONTROLS = sizeof(controls)/sizeof(struct v4l2_queryctrl);
113 diff -aur linux.backup/drivers/media/dvb/frontends/grundig_29504-401.c linux/drivers/media/dvb/frontends/grundig_29504-401.c
114 --- linux.backup/drivers/media/dvb/frontends/grundig_29504-401.c Sat Aug 16 15:02:19 2003
115 +++ linux/drivers/media/dvb/frontends/grundig_29504-401.c Sun Aug 17 00:37:54 2003
119 struct dvb_frontend_info grundig_29504_401_info = {
120 - name: "Grundig 29504-401",
122 -/* frequency_min: ???,*/
123 -/* frequency_max: ???,*/
124 - frequency_stepsize: 166666,
125 -/* frequency_tolerance: ???,*/
126 -/* symbol_rate_tolerance: ???,*/
128 - caps: FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
129 + .name = "Grundig 29504-401",
131 +/* .frequency_min = ???,*/
132 +/* .frequency_max = ???,*/
133 + .frequency_stepsize = 166666,
134 +/* .frequency_tolerance = ???,*/
135 +/* .symbol_rate_tolerance = ???,*/
136 + .notifier_delay = 0,
137 + .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
138 FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 |
139 FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 |
140 FE_CAN_MUTE_TS /*| FE_CAN_CLEAN_SETUP*/
141 diff -aur linux.backup/drivers/media/dvb/frontends/ves1820.c linux/drivers/media/dvb/frontends/ves1820.c
142 --- linux.backup/drivers/media/dvb/frontends/ves1820.c Sat Aug 16 15:02:19 2003
143 +++ linux/drivers/media/dvb/frontends/ves1820.c Sat Aug 16 18:18:40 2003
145 .symbol_rate_min = (XIN/2)/64, /* SACLK/64 == (XIN/2)/64 */
146 .symbol_rate_max = (XIN/2)/4, /* SACLK/4 */
148 - frequency_tolerance: ???,
149 - symbol_rate_tolerance: ???, /* ppm */ /* == 8% (spec p. 5) */
151 + .frequency_tolerance = ???,
152 + .symbol_rate_tolerance = ???, /* ppm */ /* == 8% (spec p. 5) */
153 + .notifier_delay = ?,
155 .caps = FE_CAN_QAM_16 | FE_CAN_QAM_32 | FE_CAN_QAM_64 |
156 FE_CAN_QAM_128 | FE_CAN_QAM_256 |
157 diff -aur linux.backup/drivers/media/dvb/ttusb-dec/dec2000_frontend.c linux/drivers/media/dvb/ttusb-dec/dec2000_frontend.c
158 --- linux.backup/drivers/media/dvb/ttusb-dec/dec2000_frontend.c Sat Aug 16 15:02:20 2003
159 +++ linux/drivers/media/dvb/ttusb-dec/dec2000_frontend.c Sat Aug 16 18:19:17 2003
161 #define dprintk if (debug) printk
163 static struct dvb_frontend_info dec2000_frontend_info = {
164 - name: "TechnoTrend/Hauppauge DEC-2000-t Frontend",
166 - frequency_min: 51000000,
167 - frequency_max: 858000000,
168 - frequency_stepsize: 62500,
169 - caps: FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
170 + .name = "TechnoTrend/Hauppauge DEC-2000-t Frontend",
172 + .frequency_min = 51000000,
173 + .frequency_max = 858000000,
174 + .frequency_stepsize = 62500,
175 + .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
176 FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
177 FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
178 FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO |
179 diff -aur linux.backup/drivers/media/dvb/ttusb-dec/ttusb_dec.c linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c
180 --- linux.backup/drivers/media/dvb/ttusb-dec/ttusb_dec.c Sat Aug 16 15:02:45 2003
181 +++ linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c Sat Aug 16 15:45:01 2003
182 @@ -1003,10 +1003,10 @@
185 static struct usb_driver ttusb_dec_driver = {
187 - probe: ttusb_dec_probe,
188 - disconnect: ttusb_dec_disconnect,
189 - id_table: ttusb_dec_table,
190 + .name = DRIVER_NAME,
191 + .probe = ttusb_dec_probe,
192 + .disconnect = ttusb_dec_disconnect,
193 + .id_table = ttusb_dec_table,
196 static int __init ttusb_dec_init(void)
197 diff -aur linux.backup/drivers/media/video/bttv-cards.c linux/drivers/media/video/bttv-cards.c
198 --- linux.backup/drivers/media/video/bttv-cards.c Sat Aug 16 15:02:45 2003
199 +++ linux/drivers/media/video/bttv-cards.c Sat Aug 16 15:45:00 2003
200 @@ -1298,7 +1298,7 @@
202 .name = "Powercolor MTV878/ MTV878R/ MTV878F",
208 .gpiomask = 0x1C800F, // Bit0-2: Audio select, 8-12:remote control 14:remote valid 15:remote reset
209 @@ -1338,7 +1338,7 @@
211 .name = "Jetway TV/Capture JW-TV878-FBK, Kworld KW-TV878RF",
218 diff -aur linux.backup/drivers/mtd/devices/blkmtd.c linux/drivers/mtd/devices/blkmtd.c
219 --- linux.backup/drivers/mtd/devices/blkmtd.c Sat Aug 16 15:02:47 2003
220 +++ linux/drivers/mtd/devices/blkmtd.c Sat Aug 16 15:45:01 2003
224 static struct address_space_operations blkmtd_aops = {
225 - writepage: blkmtd_writepage,
227 + .writepage = blkmtd_writepage,
232 diff -aur linux.backup/drivers/mtd/maps/ceiva.c linux/drivers/mtd/maps/ceiva.c
233 --- linux.backup/drivers/mtd/maps/ceiva.c Thu Jun 26 23:47:35 2003
234 +++ linux/drivers/mtd/maps/ceiva.c Sat Aug 16 18:20:47 2003
237 static struct mtd_partition ceiva_partitions[] = {
239 - name: "Ceiva BOOT partition",
240 - size: BOOT_PARTITION_SIZE_KiB*1024,
242 + .name = "Ceiva BOOT partition",
243 + .size = BOOT_PARTITION_SIZE_KiB*1024,
247 - name: "Ceiva parameters partition",
248 - size: PARAMS_PARTITION_SIZE_KiB*1024,
249 - offset: (16 + 8) * 1024,
250 + .name = "Ceiva parameters partition",
251 + .size = PARAMS_PARTITION_SIZE_KiB*1024,
252 + .offset = (16 + 8) * 1024,
254 - name: "Ceiva kernel partition",
255 - size: (KERNEL_PARTITION_SIZE_KiB)*1024,
257 + .name = "Ceiva kernel partition",
258 + .size = (KERNEL_PARTITION_SIZE_KiB)*1024,
262 - name: "Ceiva root filesystem partition",
263 - offset: MTDPART_OFS_APPEND,
264 - size: (ROOT_PARTITION_SIZE_KiB)*1024,
265 + .name = "Ceiva root filesystem partition",
266 + .offset = MTDPART_OFS_APPEND,
267 + .size = (ROOT_PARTITION_SIZE_KiB)*1024,
271 diff -aur linux.backup/drivers/mtd/nand/autcpu12.c linux/drivers/mtd/nand/autcpu12.c
272 --- linux.backup/drivers/mtd/nand/autcpu12.c Mon Jul 21 23:34:57 2003
273 +++ linux/drivers/mtd/nand/autcpu12.c Sat Aug 16 18:23:03 2003
275 extern struct nand_oobinfo jffs2_oobinfo;
277 static struct mtd_partition partition_info16k[] = {
278 - { name: "AUTCPU12 flash partition 1",
281 - { name: "AUTCPU12 flash partition 2",
284 + { .name = "AUTCPU12 flash partition 1",
286 + .size = 8 * SZ_1M },
287 + { .name = "AUTCPU12 flash partition 2",
288 + .offset = 8 * SZ_1M,
289 + .size = 8 * SZ_1M },
292 static struct mtd_partition partition_info32k[] = {
293 - { name: "AUTCPU12 flash partition 1",
296 - { name: "AUTCPU12 flash partition 2",
298 - size: 24 * SZ_1M },
299 + { .name = "AUTCPU12 flash partition 1",
301 + .size = 8 * SZ_1M },
302 + { .name = "AUTCPU12 flash partition 2",
303 + .offset = 8 * SZ_1M,
304 + .size = 24 * SZ_1M },
307 static struct mtd_partition partition_info64k[] = {
308 - { name: "AUTCPU12 flash partition 1",
310 - size: 16 * SZ_1M },
311 - { name: "AUTCPU12 flash partition 2",
312 - offset: 16 * SZ_1M,
313 - size: 48 * SZ_1M },
314 + { .name = "AUTCPU12 flash partition 1",
316 + .size = 16 * SZ_1M },
317 + { .name = "AUTCPU12 flash partition 2",
318 + .offset = 16 * SZ_1M,
319 + .size = 48 * SZ_1M },
322 static struct mtd_partition partition_info128k[] = {
323 - { name: "AUTCPU12 flash partition 1",
325 - size: 16 * SZ_1M },
326 - { name: "AUTCPU12 flash partition 2",
327 - offset: 16 * SZ_1M,
328 - size: 112 * SZ_1M },
329 + { .name = "AUTCPU12 flash partition 1",
331 + .size = 16 * SZ_1M },
332 + { .name = "AUTCPU12 flash partition 2",
333 + .offset = 16 * SZ_1M,
334 + .size = 112 * SZ_1M },
337 #define NUM_PARTITIONS16K 2
338 diff -aur linux.backup/drivers/mtd/nand/edb7312.c linux/drivers/mtd/nand/edb7312.c
339 --- linux.backup/drivers/mtd/nand/edb7312.c Thu Jun 26 23:47:35 2003
340 +++ linux/drivers/mtd/nand/edb7312.c Sat Aug 16 23:42:41 2003
342 * Define static partitions for flash device
344 static struct mtd_partition partition_info[] = {
345 - { name: "EP7312 Nand Flash",
347 - size: 8*1024*1024 }
348 + { .name = "EP7312 Nand Flash",
350 + .size = 8*1024*1024 }
352 #define NUM_PARTITIONS 1
354 diff -aur linux.backup/drivers/net/amd8111e.c linux/drivers/net/amd8111e.c
355 --- linux.backup/drivers/net/amd8111e.c Sat Aug 16 15:02:48 2003
356 +++ linux/drivers/net/amd8111e.c Sat Aug 16 23:45:23 2003
357 @@ -1940,12 +1940,12 @@
360 static struct pci_driver amd8111e_driver = {
362 - id_table: amd8111e_pci_tbl,
363 - probe: amd8111e_probe_one,
364 - remove: __devexit_p(amd8111e_remove_one),
365 - suspend: amd8111e_suspend,
366 - resume: amd8111e_resume
367 + .name = MODULE_NAME,
368 + .id_table = amd8111e_pci_tbl,
369 + .probe = amd8111e_probe_one,
370 + .remove = __devexit_p(amd8111e_remove_one),
371 + .suspend = amd8111e_suspend,
372 + .resume = amd8111e_resume
375 static int __init amd8111e_init(void)
376 diff -aur linux.backup/drivers/net/arm/ether00.c linux/drivers/net/arm/ether00.c
377 --- linux.backup/drivers/net/arm/ether00.c Sat Aug 16 15:02:48 2003
378 +++ linux/drivers/net/arm/ether00.c Sat Aug 16 15:45:00 2003
382 static struct pld_hotswap_ops ether00_pldhs_ops={
383 - name: ETHER00_NAME,
384 - add_device: ether00_add_device,
385 - remove_devices: ether00_remove_devices,
386 + .name = ETHER00_NAME,
387 + .add_device = ether00_add_device,
388 + .remove_devices = ether00_remove_devices,
392 diff -aur linux.backup/drivers/net/irda/via-ircc.c linux/drivers/net/irda/via-ircc.c
393 --- linux.backup/drivers/net/irda/via-ircc.c Sat Aug 16 15:02:49 2003
394 +++ linux/drivers/net/irda/via-ircc.c Sat Aug 16 15:45:00 2003
395 @@ -134,10 +134,10 @@
398 static struct pci_driver via_driver = {
399 - name: VIA_MODULE_NAME,
400 - id_table: via_pci_tbl,
401 - probe: via_init_one,
402 - remove: via_remove_one,
403 + .name = VIA_MODULE_NAME,
404 + .id_table = via_pci_tbl,
405 + .probe = via_init_one,
406 + .remove = via_remove_one,
410 diff -aur linux.backup/drivers/net/sungem_phy.c linux/drivers/net/sungem_phy.c
411 --- linux.backup/drivers/net/sungem_phy.c Thu Jun 26 23:46:36 2003
412 +++ linux/drivers/net/sungem_phy.c Sat Aug 16 23:49:13 2003
413 @@ -634,116 +634,116 @@
415 /* Broadcom BCM 5201 */
416 static struct mii_phy_ops bcm5201_phy_ops = {
417 - init: bcm5201_init,
418 - suspend: bcm5201_suspend,
419 - setup_aneg: genmii_setup_aneg,
420 - setup_forced: genmii_setup_forced,
421 - poll_link: genmii_poll_link,
422 - read_link: genmii_read_link,
423 + .init = bcm5201_init,
424 + .suspend = bcm5201_suspend,
425 + .setup_aneg = genmii_setup_aneg,
426 + .setup_forced = genmii_setup_forced,
427 + .poll_link = genmii_poll_link,
428 + .read_link = genmii_read_link,
431 static struct mii_phy_def bcm5201_phy_def = {
432 - phy_id: 0x00406210,
433 - phy_id_mask: 0xfffffff0,
435 - features: MII_BASIC_FEATURES,
437 - ops: &bcm5201_phy_ops
438 + .phy_id = 0x00406210,
439 + .phy_id_mask = 0xfffffff0,
441 + .features = MII_BASIC_FEATURES,
443 + .ops = &bcm5201_phy_ops
446 /* Broadcom BCM 5221 */
447 static struct mii_phy_ops bcm5221_phy_ops = {
448 - suspend: bcm5201_suspend,
449 - init: bcm5221_init,
450 - setup_aneg: genmii_setup_aneg,
451 - setup_forced: genmii_setup_forced,
452 - poll_link: genmii_poll_link,
453 - read_link: genmii_read_link,
454 + .suspend = bcm5201_suspend,
455 + .init = bcm5221_init,
456 + .setup_aneg = genmii_setup_aneg,
457 + .setup_forced = genmii_setup_forced,
458 + .poll_link = genmii_poll_link,
459 + .read_link = genmii_read_link,
462 static struct mii_phy_def bcm5221_phy_def = {
463 - phy_id: 0x004061e0,
464 - phy_id_mask: 0xfffffff0,
466 - features: MII_BASIC_FEATURES,
468 - ops: &bcm5221_phy_ops
469 + .phy_id = 0x004061e0,
470 + .phy_id_mask = 0xfffffff0,
472 + .features = MII_BASIC_FEATURES,
474 + .ops = &bcm5221_phy_ops
477 /* Broadcom BCM 5400 */
478 static struct mii_phy_ops bcm5400_phy_ops = {
479 - init: bcm5400_init,
480 - suspend: bcm5400_suspend,
481 - setup_aneg: bcm54xx_setup_aneg,
482 - setup_forced: bcm54xx_setup_forced,
483 - poll_link: genmii_poll_link,
484 - read_link: bcm54xx_read_link,
485 + .init = bcm5400_init,
486 + .suspend = bcm5400_suspend,
487 + .setup_aneg = bcm54xx_setup_aneg,
488 + .setup_forced = bcm54xx_setup_forced,
489 + .poll_link = genmii_poll_link,
490 + .read_link = bcm54xx_read_link,
493 static struct mii_phy_def bcm5400_phy_def = {
494 - phy_id: 0x00206040,
495 - phy_id_mask: 0xfffffff0,
497 - features: MII_GBIT_FEATURES,
499 - ops: &bcm5400_phy_ops
500 + .phy_id = 0x00206040,
501 + .phy_id_mask = 0xfffffff0,
503 + .features = MII_GBIT_FEATURES,
505 + .ops = &bcm5400_phy_ops
508 /* Broadcom BCM 5401 */
509 static struct mii_phy_ops bcm5401_phy_ops = {
510 - init: bcm5401_init,
511 - suspend: bcm5401_suspend,
512 - setup_aneg: bcm54xx_setup_aneg,
513 - setup_forced: bcm54xx_setup_forced,
514 - poll_link: genmii_poll_link,
515 - read_link: bcm54xx_read_link,
516 + .init = bcm5401_init,
517 + .suspend = bcm5401_suspend,
518 + .setup_aneg = bcm54xx_setup_aneg,
519 + .setup_forced = bcm54xx_setup_forced,
520 + .poll_link = genmii_poll_link,
521 + .read_link = bcm54xx_read_link,
524 static struct mii_phy_def bcm5401_phy_def = {
525 - phy_id: 0x00206050,
526 - phy_id_mask: 0xfffffff0,
528 - features: MII_GBIT_FEATURES,
530 - ops: &bcm5401_phy_ops
531 + .phy_id = 0x00206050,
532 + .phy_id_mask = 0xfffffff0,
534 + .features = MII_GBIT_FEATURES,
536 + .ops = &bcm5401_phy_ops
539 /* Broadcom BCM 5411 */
540 static struct mii_phy_ops bcm5411_phy_ops = {
541 - init: bcm5411_init,
542 - suspend: bcm5411_suspend,
543 - setup_aneg: bcm54xx_setup_aneg,
544 - setup_forced: bcm54xx_setup_forced,
545 - poll_link: genmii_poll_link,
546 - read_link: bcm54xx_read_link,
547 + .init = bcm5411_init,
548 + .suspend = bcm5411_suspend,
549 + .setup_aneg = bcm54xx_setup_aneg,
550 + .setup_forced = bcm54xx_setup_forced,
551 + .poll_link = genmii_poll_link,
552 + .read_link = bcm54xx_read_link,
555 static struct mii_phy_def bcm5411_phy_def = {
556 - phy_id: 0x00206070,
557 - phy_id_mask: 0xfffffff0,
559 - features: MII_GBIT_FEATURES,
561 - ops: &bcm5411_phy_ops
562 + .phy_id = 0x00206070,
563 + .phy_id_mask = 0xfffffff0,
565 + .features = MII_GBIT_FEATURES,
567 + .ops = &bcm5411_phy_ops
570 /* Broadcom BCM 5421 */
571 static struct mii_phy_ops bcm5421_phy_ops = {
572 - init: bcm5421_init,
573 - suspend: bcm5411_suspend,
574 - setup_aneg: bcm54xx_setup_aneg,
575 - setup_forced: bcm54xx_setup_forced,
576 - poll_link: genmii_poll_link,
577 - read_link: bcm54xx_read_link,
578 + .init = bcm5421_init,
579 + .suspend = bcm5411_suspend,
580 + .setup_aneg = bcm54xx_setup_aneg,
581 + .setup_forced = bcm54xx_setup_forced,
582 + .poll_link = genmii_poll_link,
583 + .read_link = bcm54xx_read_link,
586 static struct mii_phy_def bcm5421_phy_def = {
587 - phy_id: 0x002060e0,
588 - phy_id_mask: 0xfffffff0,
590 - features: MII_GBIT_FEATURES,
592 - ops: &bcm5421_phy_ops
593 + .phy_id = 0x002060e0,
594 + .phy_id_mask = 0xfffffff0,
596 + .features = MII_GBIT_FEATURES,
598 + .ops = &bcm5421_phy_ops
601 /* Marvell 88E1101 (Apple seem to deal with 2 different revs,
602 @@ -751,36 +751,36 @@
603 * would be useful here) --BenH.
605 static struct mii_phy_ops marvell_phy_ops = {
606 - setup_aneg: marvell_setup_aneg,
607 - setup_forced: marvell_setup_forced,
608 - poll_link: genmii_poll_link,
609 - read_link: marvell_read_link
610 + .setup_aneg = marvell_setup_aneg,
611 + .setup_forced = marvell_setup_forced,
612 + .poll_link = genmii_poll_link,
613 + .read_link = marvell_read_link
616 static struct mii_phy_def marvell_phy_def = {
617 - phy_id: 0x01410c00,
618 - phy_id_mask: 0xffffff00,
619 - name: "Marvell 88E1101",
620 - features: MII_GBIT_FEATURES,
622 - ops: &marvell_phy_ops
623 + .phy_id = 0x01410c00,
624 + .phy_id_mask = 0xffffff00,
625 + .name = "Marvell 88E1101",
626 + .features = MII_GBIT_FEATURES,
628 + .ops = &marvell_phy_ops
631 /* Generic implementation for most 10/100 PHYs */
632 static struct mii_phy_ops generic_phy_ops = {
633 - setup_aneg: genmii_setup_aneg,
634 - setup_forced: genmii_setup_forced,
635 - poll_link: genmii_poll_link,
636 - read_link: genmii_read_link
637 + .setup_aneg = genmii_setup_aneg,
638 + .setup_forced = genmii_setup_forced,
639 + .poll_link = genmii_poll_link,
640 + .read_link = genmii_read_link
643 static struct mii_phy_def genmii_phy_def = {
644 - phy_id: 0x00000000,
645 - phy_id_mask: 0x00000000,
646 - name: "Generic MII",
647 - features: MII_BASIC_FEATURES,
649 - ops: &generic_phy_ops
650 + .phy_id = 0x00000000,
651 + .phy_id_mask = 0x00000000,
652 + .name = "Generic MII",
653 + .features = MII_BASIC_FEATURES,
655 + .ops = &generic_phy_ops
658 static struct mii_phy_def* mii_phy_table[] = {
659 diff -aur linux.backup/drivers/s390/net/qeth.c linux/drivers/s390/net/qeth.c
660 --- linux.backup/drivers/s390/net/qeth.c Sat Aug 16 15:02:22 2003
661 +++ linux/drivers/s390/net/qeth.c Sat Aug 16 23:52:37 2003
662 @@ -9765,19 +9765,19 @@
665 static struct file_operations qeth_procfile_fops = {
666 - ioctl:qeth_procfile_ioctl,
667 - read:qeth_procfile_read,
668 - open:qeth_procfile_open,
669 - release:qeth_procfile_release,
670 + .ioctl = qeth_procfile_ioctl,
671 + .read = qeth_procfile_read,
672 + .open = qeth_procfile_open,
673 + .release = qeth_procfile_release,
676 static struct proc_dir_entry *qeth_proc_file;
678 static struct file_operations qeth_ipato_procfile_fops = {
679 - read:qeth_procfile_read, /* same as above! */
680 - write:qeth_ipato_procfile_write,
681 - open:qeth_ipato_procfile_open,
682 - release:qeth_procfile_release /* same as above! */
683 + .read = qeth_procfile_read, /* same as above! */
684 + .write = qeth_ipato_procfile_write,
685 + .open = qeth_ipato_procfile_open,
686 + .release = qeth_procfile_release /* same as above! */
689 static struct proc_dir_entry *qeth_ipato_proc_file;
690 diff -aur linux.backup/drivers/scsi/aic7xxx/aic79xx_osm_pci.c linux/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
691 --- linux.backup/drivers/scsi/aic7xxx/aic79xx_osm_pci.c Thu Jun 26 23:48:40 2003
692 +++ linux/drivers/scsi/aic7xxx/aic79xx_osm_pci.c Sat Aug 16 23:52:54 2003
694 MODULE_DEVICE_TABLE(pci, ahd_linux_pci_id_table);
696 struct pci_driver aic79xx_pci_driver = {
698 - probe: ahd_linux_pci_dev_probe,
699 - remove: ahd_linux_pci_dev_remove,
700 - id_table: ahd_linux_pci_id_table
702 + .probe = ahd_linux_pci_dev_probe,
703 + .remove = ahd_linux_pci_dev_remove,
704 + .id_table = ahd_linux_pci_id_table
708 diff -aur linux.backup/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c linux/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
709 --- linux.backup/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c Thu Jun 26 23:47:40 2003
710 +++ linux/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c Sat Aug 16 23:53:12 2003
712 MODULE_DEVICE_TABLE(pci, ahc_linux_pci_id_table);
714 struct pci_driver aic7xxx_pci_driver = {
716 - probe: ahc_linux_pci_dev_probe,
717 - remove: ahc_linux_pci_dev_remove,
718 - id_table: ahc_linux_pci_id_table
720 + .probe = ahc_linux_pci_dev_probe,
721 + .remove = ahc_linux_pci_dev_remove,
722 + .id_table = ahc_linux_pci_id_table
726 diff -aur linux.backup/drivers/usb/host/hc_sl811_rh.c linux/drivers/usb/host/hc_sl811_rh.c
727 --- linux.backup/drivers/usb/host/hc_sl811_rh.c Sat Aug 16 15:02:54 2003
728 +++ linux/drivers/usb/host/hc_sl811_rh.c Sat Aug 16 23:57:09 2003
730 switch (bmRType_bReq) {
731 /* Request Destination:
732 without flags: Device,
733 - RH_INTERFACE: interface,
734 + RH_INTERFACE: interface,
735 RH_ENDPOINT: endpoint,
736 RH_CLASS means HUB here,
737 RH_OTHER | RH_CLASS almost ever means HUB_PORT here
738 diff -aur linux.backup/drivers/video/68328fb.c linux/drivers/video/68328fb.c
739 --- linux.backup/drivers/video/68328fb.c Tue Dec 10 15:18:53 2002
740 +++ linux/drivers/video/68328fb.c Sat Aug 16 23:58:20 2003
741 @@ -401,12 +401,12 @@
742 ((1<<(width))-1)) : 0))
744 static struct fb_ops mc68328_fb_ops = {
745 - .owner: THIS_MODULE,
746 - .fb_setcolreg: mc68328fb_setcolreg,
747 - .fb_fillrect: cfbfillrect,
748 - .fb_copyarea: cfbcopyarea,
749 - .fb_imageblit: cfbimgblt,
750 - .fb_cursor: softcursor,
751 + .owner = THIS_MODULE,
752 + .fb_setcolreg = mc68328fb_setcolreg,
753 + .fb_fillrect = cfbfillrect,
754 + .fb_copyarea = cfbcopyarea,
755 + .fb_imageblit = cfbimgblt,
756 + .fb_cursor = softcursor,
760 diff -aur linux.backup/drivers/video/riva/fbdev.c linux/drivers/video/riva/fbdev.c
761 --- linux.backup/drivers/video/riva/fbdev.c Sat Aug 16 15:02:55 2003
762 +++ linux/drivers/video/riva/fbdev.c Sat Aug 16 23:59:34 2003
763 @@ -297,34 +297,34 @@
766 static struct fb_fix_screeninfo rivafb_fix = {
768 - type: FB_TYPE_PACKED_PIXELS,
772 + .type = FB_TYPE_PACKED_PIXELS,
777 static struct fb_var_screeninfo rivafb_default_var = {
787 - activate: FB_ACTIVATE_NOW,
790 - accel_flags: FB_ACCELF_TEXT,
798 - vmode: FB_VMODE_NONINTERLACED
801 + .xres_virtual = 640,
802 + .yres_virtual = 480,
803 + .bits_per_pixel = 8,
805 + .green = {0, 8, 0},
807 + .transp = {0, 0, 0},
808 + .activate = FB_ACTIVATE_NOW,
811 + .accel_flags = FB_ACCELF_TEXT,
814 + .right_margin = 24,
815 + .upper_margin = 32,
816 + .lower_margin = 11,
819 + .vmode = FB_VMODE_NONINTERLACED
823 @@ -1977,10 +1977,10 @@
826 static struct pci_driver rivafb_driver = {
828 - id_table: rivafb_pci_tbl,
829 - probe: rivafb_probe,
830 - remove: __exit_p(rivafb_remove),
832 + .id_table = rivafb_pci_tbl,
833 + .probe = rivafb_probe,
834 + .remove = __exit_p(rivafb_remove),
838 diff -aur linux.backup/drivers/video/sis/sis_accel.c linux/drivers/video/sis/sis_accel.c
839 --- linux.backup/drivers/video/sis/sis_accel.c Tue Mar 25 10:54:08 2003
840 +++ linux/drivers/video/sis/sis_accel.c Sun Aug 17 00:02:32 2003
841 @@ -591,38 +591,38 @@
843 #ifdef FBCON_HAS_CFB8
844 struct display_switch fbcon_sis8 = {
845 - setup: fbcon_cfb8_setup,
846 - bmove: fbcon_sis_bmove,
847 - clear: fbcon_sis_clear8,
848 - putc: fbcon_cfb8_putc,
849 - putcs: fbcon_cfb8_putcs,
850 - revc: fbcon_cfb8_revc,
851 - clear_margins: fbcon_cfb8_clear_margins,
852 - fontwidthmask: FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
853 + .setup = fbcon_cfb8_setup,
854 + .bmove = fbcon_sis_bmove,
855 + .clear = fbcon_sis_clear8,
856 + .putc = fbcon_cfb8_putc,
857 + .putcs = fbcon_cfb8_putcs,
858 + .revc = fbcon_cfb8_revc,
859 + .clear_margins = fbcon_cfb8_clear_margins,
860 + .fontwidthmask = FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
863 #ifdef FBCON_HAS_CFB16
864 struct display_switch fbcon_sis16 = {
865 - setup: fbcon_cfb16_setup,
866 - bmove: fbcon_sis_bmove,
867 - clear: fbcon_sis_clear16,
868 - putc: fbcon_cfb16_putc,
869 - putcs: fbcon_cfb16_putcs,
870 - revc: fbcon_sis_revc,
871 - clear_margins: fbcon_cfb16_clear_margins,
872 - fontwidthmask: FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
873 + .setup = fbcon_cfb16_setup,
874 + .bmove = fbcon_sis_bmove,
875 + .clear = fbcon_sis_clear16,
876 + .putc = fbcon_cfb16_putc,
877 + .putcs = fbcon_cfb16_putcs,
878 + .revc = fbcon_sis_revc,
879 + .clear_margins = fbcon_cfb16_clear_margins,
880 + .fontwidthmask = FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
883 #ifdef FBCON_HAS_CFB32
884 struct display_switch fbcon_sis32 = {
885 - setup: fbcon_cfb32_setup,
886 - bmove: fbcon_sis_bmove,
887 - clear: fbcon_sis_clear32,
888 - putc: fbcon_cfb32_putc,
889 - putcs: fbcon_cfb32_putcs,
890 - revc: fbcon_sis_revc,
891 - clear_margins: fbcon_cfb32_clear_margins,
892 - fontwidthmask: FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
893 + .setup = fbcon_cfb32_setup,
894 + .bmove = fbcon_sis_bmove,
895 + .clear = fbcon_sis_clear32,
896 + .putc = fbcon_cfb32_putc,
897 + .putcs = fbcon_cfb32_putcs,
898 + .revc = fbcon_sis_revc,
899 + .clear_margins = fbcon_cfb32_clear_margins,
900 + .fontwidthmask = FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
904 diff -aur linux.backup/drivers/video/sis/sis_main.c linux/drivers/video/sis/sis_main.c
905 --- linux.backup/drivers/video/sis/sis_main.c Thu Jun 26 23:47:47 2003
906 +++ linux/drivers/video/sis/sis_main.c Sat Aug 16 15:45:01 2003
907 @@ -2033,17 +2033,17 @@
909 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
910 static struct fb_ops sisfb_ops = {
911 - owner: THIS_MODULE,
912 - fb_get_fix: sisfb_get_fix,
913 - fb_get_var: sisfb_get_var,
914 - fb_set_var: sisfb_set_var,
915 - fb_get_cmap: sisfb_get_cmap,
916 - fb_set_cmap: sisfb_set_cmap,
917 + .owner = THIS_MODULE,
918 + .fb_get_fix = sisfb_get_fix,
919 + .fb_get_var = sisfb_get_var,
920 + .fb_set_var = sisfb_set_var,
921 + .fb_get_cmap = sisfb_get_cmap,
922 + .fb_set_cmap = sisfb_set_cmap,
924 - fb_pan_display: sisfb_pan_display,
925 + .fb_pan_display = sisfb_pan_display,
927 - fb_ioctl: sisfb_ioctl,
928 - fb_mmap: sisfb_mmap,
929 + .fb_ioctl = sisfb_ioctl,
930 + .fb_mmap = sisfb_mmap,