aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x
diff options
context:
space:
mode:
authorAlexander Clouter <alex@digriz.org.uk>2012-05-12 10:17:01 -0400
committerAndrew Lunn <andrew@lunn.ch>2012-05-14 12:13:03 -0400
commit4f8cf6106dcf77b9b60af23cbb35fd537b1c9c1d (patch)
tree1c6d40bf3754f6224c5b5ff1552a70477c9ba66a /arch/arm/mach-orion5x
parent167473a5937f54aaac4c3c01a192a81214933a23 (diff)
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>
Diffstat (limited to 'arch/arm/mach-orion5x')
-rw-r--r--arch/arm/mach-orion5x/Kconfig1
-rw-r--r--arch/arm/mach-orion5x/ts78xx-setup.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
index 6604fc6ca58a..0673f0c10432 100644
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -86,7 +86,6 @@ config MACH_WRT350N_V2
86 86
87config MACH_TS78XX 87config MACH_TS78XX
88 bool "Technologic Systems TS-78xx" 88 bool "Technologic Systems TS-78xx"
89 select PM
90 help 89 help
91 Say 'Y' here if you want your kernel to support the 90 Say 'Y' here if you want your kernel to support the
92 Technologic Systems TS-78xx platform. 91 Technologic Systems TS-78xx platform.
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index d8670cbae770..1e1436363b8b 100644
--- 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)
608 /* FPGA init */ 608 /* FPGA init */
609 ts78xx_fpga_devices_zero_init(); 609 ts78xx_fpga_devices_zero_init();
610 ret = ts78xx_fpga_load(); 610 ret = ts78xx_fpga_load();
611 ret = sysfs_create_file(power_kobj, &ts78xx_fpga_attr.attr); 611 ret = sysfs_create_file(firmware_kobj, &ts78xx_fpga_attr.attr);
612 if (ret) 612 if (ret)
613 pr_err("sysfs_create_file failed: %d\n", ret); 613 pr_err("sysfs_create_file failed: %d\n", ret);
614} 614}