Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...

[sfrench/cifs-2.6.git] / arch / powerpc / sysdev / mv64x60_pci.c

diff --git a/arch/powerpc/sysdev/mv64x60_pci.c b/arch/powerpc/sysdev/mv64x60_pci.c
index d21ab8fa4993c87d464c0c81a6fcb56d3dfc01f3..198f288570cc3b966876a8fe737c3fdf274acdd4 100644 (file)
--- a/arch/powerpc/sysdev/mv64x60_pci.c
+++ b/arch/powerpc/sysdev/mv64x60_pci.c
@@ -24,7 +24,7 @@
 #define MV64X60_VAL_LEN_MAX            11
 #define MV64X60_PCICFG_CPCI_HOTSWAP    0x68
 
-static ssize_t mv64x60_hs_reg_read(struct kobject *kobj,
+static ssize_t mv64x60_hs_reg_read(struct file *filp, struct kobject *kobj,
                                   struct bin_attribute *attr, char *buf,
                                   loff_t off, size_t count)
 {
@@ -45,7 +45,7 @@ static ssize_t mv64x60_hs_reg_read(struct kobject *kobj,
        return sprintf(buf, "0x%08x\n", v);
 }
 
-static ssize_t mv64x60_hs_reg_write(struct kobject *kobj,
+static ssize_t mv64x60_hs_reg_write(struct file *filp, struct kobject *kobj,
                                    struct bin_attribute *attr, char *buf,
                                    loff_t off, size_t count)
 {
@@ -86,14 +86,14 @@ static int __init mv64x60_sysfs_init(void)
        struct platform_device *pdev;
        const unsigned int *prop;
 
-       np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60");
+       np = of_find_compatible_node(NULL, NULL, "marvell,mv64360");
        if (!np)
                return 0;
 
        prop = of_get_property(np, "hs_reg_valid", NULL);
        of_node_put(np);
 
-       pdev = platform_device_register_simple("marvell,mv64x60", 0, NULL, 0);
+       pdev = platform_device_register_simple("marvell,mv64360", 0, NULL, 0);
        if (IS_ERR(pdev))
                return PTR_ERR(pdev);
 
@@ -166,6 +166,6 @@ void __init mv64x60_pci_init(void)
 {
        struct device_node *np;
 
-       for_each_compatible_node(np, "pci", "marvell,mv64x60-pci")
+       for_each_compatible_node(np, "pci", "marvell,mv64360-pci")
                mv64x60_add_bridge(np);
 }