ARM: orion5x: remove PM dependency from ts78xx

Move ts78xx_fpga from /sys/power to /sys/firmware so that
we can remove the PM dependency.

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>

diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
index 6604fc6..0673f0c 100644 (file)
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -86,7 +86,6 @@ config MACH_WRT350N_V2
 
 config MACH_TS78XX
        bool "Technologic Systems TS-78xx"
-       select PM
        help
          Say 'Y' here if you want your kernel to support the
          Technologic Systems TS-78xx platform.

diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index d8670cb..1e14363 100644 (file)
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -608,7 +608,7 @@ static void __init ts78xx_init(void)
        /* FPGA init */
        ts78xx_fpga_devices_zero_init();
        ret = ts78xx_fpga_load();
-       ret = sysfs_create_file(power_kobj, &ts78xx_fpga_attr.attr);
+       ret = sysfs_create_file(firmware_kobj, &ts78xx_fpga_attr.attr);
        if (ret)
                pr_err("sysfs_create_file failed: %d\n", ret);
 }