diff options
Diffstat (limited to 'arch/sparc/include/asm/floppy_64.h')
-rw-r--r-- | arch/sparc/include/asm/floppy_64.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc/include/asm/floppy_64.h b/arch/sparc/include/asm/floppy_64.h index 8fac3ab22f36..6597ce874d78 100644 --- a/arch/sparc/include/asm/floppy_64.h +++ b/arch/sparc/include/asm/floppy_64.h | |||
@@ -43,7 +43,7 @@ struct sun_flpy_controller { | |||
43 | /* You'll only ever find one controller on an Ultra anyways. */ | 43 | /* You'll only ever find one controller on an Ultra anyways. */ |
44 | static struct sun_flpy_controller *sun_fdc = (struct sun_flpy_controller *)-1; | 44 | static struct sun_flpy_controller *sun_fdc = (struct sun_flpy_controller *)-1; |
45 | unsigned long fdc_status; | 45 | unsigned long fdc_status; |
46 | static struct of_device *floppy_op = NULL; | 46 | static struct platform_device *floppy_op = NULL; |
47 | 47 | ||
48 | struct sun_floppy_ops { | 48 | struct sun_floppy_ops { |
49 | unsigned char (*fd_inb) (unsigned long port); | 49 | unsigned char (*fd_inb) (unsigned long port); |
@@ -548,7 +548,7 @@ static unsigned long __init sun_floppy_init(void) | |||
548 | { | 548 | { |
549 | static int initialized = 0; | 549 | static int initialized = 0; |
550 | struct device_node *dp; | 550 | struct device_node *dp; |
551 | struct of_device *op; | 551 | struct platform_device *op; |
552 | const char *prop; | 552 | const char *prop; |
553 | char state[128]; | 553 | char state[128]; |
554 | 554 | ||
@@ -567,7 +567,7 @@ static unsigned long __init sun_floppy_init(void) | |||
567 | } | 567 | } |
568 | if (op) { | 568 | if (op) { |
569 | floppy_op = op; | 569 | floppy_op = op; |
570 | FLOPPY_IRQ = op->irqs[0]; | 570 | FLOPPY_IRQ = op->archdata.irqs[0]; |
571 | } else { | 571 | } else { |
572 | struct device_node *ebus_dp; | 572 | struct device_node *ebus_dp; |
573 | void __iomem *auxio_reg; | 573 | void __iomem *auxio_reg; |
@@ -593,7 +593,7 @@ static unsigned long __init sun_floppy_init(void) | |||
593 | if (state_prop && !strncmp(state_prop, "disabled", 8)) | 593 | if (state_prop && !strncmp(state_prop, "disabled", 8)) |
594 | return 0; | 594 | return 0; |
595 | 595 | ||
596 | FLOPPY_IRQ = op->irqs[0]; | 596 | FLOPPY_IRQ = op->archdata.irqs[0]; |
597 | 597 | ||
598 | /* Make sure the high density bit is set, some systems | 598 | /* Make sure the high density bit is set, some systems |
599 | * (most notably Ultra5/Ultra10) come up with it clear. | 599 | * (most notably Ultra5/Ultra10) come up with it clear. |
@@ -661,7 +661,7 @@ static unsigned long __init sun_floppy_init(void) | |||
661 | config = 0; | 661 | config = 0; |
662 | for (dp = ebus_dp->child; dp; dp = dp->sibling) { | 662 | for (dp = ebus_dp->child; dp; dp = dp->sibling) { |
663 | if (!strcmp(dp->name, "ecpp")) { | 663 | if (!strcmp(dp->name, "ecpp")) { |
664 | struct of_device *ecpp_op; | 664 | struct platform_device *ecpp_op; |
665 | 665 | ||
666 | ecpp_op = of_find_device_by_node(dp); | 666 | ecpp_op = of_find_device_by_node(dp); |
667 | if (ecpp_op) | 667 | if (ecpp_op) |