diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-06-23 13:36:26 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:41 +0200 |
| commit | 24cbb81f258b017de58ba488d6a6ecf9069aef7e (patch) | |
| tree | 8713ab682b667f6180e43b19dbb23b73242739f2 /arch/arm/mach-ux500/cpu-db8500.c | |
| parent | 78795d7a2a52afca3e80ecb94ca4022ce2364bf6 (diff) | |
mach-ux500: Fix merge problems and changes for 3.0
Must be cleaned!!
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/cpu-db8500.c')
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 78a3e624138..ca5f7754909 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -496,13 +496,14 @@ static ssize_t ux500_get_process(char *buf, struct sysfs_soc_info *si) static ssize_t ux500_get_reset_code(char *buf, struct sysfs_soc_info *si) { - return sprintf(buf, "0x%04x\n", prcmu_get_reset_code()); + return 0; + //EROBEMA return sprintf(buf, "0x%04x\n", prcmu_get_reset_code()); } static ssize_t ux500_get_reset_reason(char *buf, struct sysfs_soc_info *si) { - return sprintf(buf, "%s\n", - reboot_reason_string(prcmu_get_reset_code())); + return 0; + //EROBEMA return sprintf(buf, "%s\n", reboot_reason_string(prcmu_get_reset_code())); } static struct sysfs_soc_info soc_info[] = { @@ -511,7 +512,7 @@ static struct sysfs_soc_info soc_info[] = { SYSFS_SOC_ATTR_CALLBACK("soc_id", ux500_get_soc_id), SYSFS_SOC_ATTR_CALLBACK("revision", ux500_get_revision), SYSFS_SOC_ATTR_CALLBACK("process", ux500_get_process), - SYSFS_SOC_ATTR_CALLBACK("reset_code", ux500_get_reset_code), +//EROBEMA SYSFS_SOC_ATTR_CALLBACK("reset_code", ux500_get_reset_code), SYSFS_SOC_ATTR_CALLBACK("reset_reason", ux500_get_reset_reason), }; |