From 92c95cbc89842c69e3cbf86e4bc37cc5d150af17 Mon Sep 17 00:00:00 2001 From: Alexander Clouter Date: Sat, 12 May 2012 15:17:01 +0100 Subject: [PATCH] --- yaml --- r: 303124 b: refs/heads/master c: 4f8cf6106dcf77b9b60af23cbb35fd537b1c9c1d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-orion5x/Kconfig | 1 - trunk/arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7b0b9890b541..8eb9fdc6fbac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 167473a5937f54aaac4c3c01a192a81214933a23 +refs/heads/master: 4f8cf6106dcf77b9b60af23cbb35fd537b1c9c1d diff --git a/trunk/arch/arm/mach-orion5x/Kconfig b/trunk/arch/arm/mach-orion5x/Kconfig index 6604fc6ca58a..0673f0c10432 100644 --- a/trunk/arch/arm/mach-orion5x/Kconfig +++ b/trunk/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/trunk/arch/arm/mach-orion5x/ts78xx-setup.c b/trunk/arch/arm/mach-orion5x/ts78xx-setup.c index d8670cbae770..1e1436363b8b 100644 --- a/trunk/arch/arm/mach-orion5x/ts78xx-setup.c +++ b/trunk/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); }