From 4f8cf6106dcf77b9b60af23cbb35fd537b1c9c1d Mon Sep 17 00:00:00 2001 From: Alexander Clouter Date: Sat, 12 May 2012 15:17:01 +0100 Subject: 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 Signed-off-by: Andrew Lunn --- arch/arm/mach-orion5x/Kconfig | 1 - arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/arm/mach-orion5x') 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 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 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) /* 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); } -- cgit v1.2.3-55-g7522