Hello Wolfgang,
I've found this merge-merge-error.
best regards
Sascha Laue
From: Sascha Laue <[EMAIL PROTECTED]>
Date: Wed, 30 Apr 2008 12:27:21 +0200
Subject: [PATCH] fix manual merge error in lwmon5 posttest.
Signed-off-by: Sascha Laue <[EMAIL PROTECTED]>
---
post/board/lwmon5/sysmon.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/post/board/lwmon5/sysmon.c b/post/board/lwmon5/sysmon.c
index 793f670..23cb709 100644
--- a/post/board/lwmon5/sysmon.c
+++ b/post/board/lwmon5/sysmon.c
@@ -132,7 +132,7 @@ static sysmon_table_t sysmon_table[] =
{
"+ 5 V", "V", &sysmon_dspic, NULL, NULL,
- 100, 1000, 0, 0xFFFF, 0xFFFF,
+ 100, 1000, -0x8000, 0x7FFF, 0xFFFF,
VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0,
VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0,
REG_VOLTAGE_5V,
@@ -140,7 +140,7 @@ static sysmon_table_t sysmon_table[] =
{
"+ 5 V standby", "V", &sysmon_dspic, NULL, NULL,
- 100, 1000, 0, 0xFFFF, 0xFFFF,
+ 100, 1000, -0x8000, 0x7FFF, 0xFFFF,
VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
REG_VOLTAGE_5V_STANDBY,
--
1.5.2.4
-------- Original-Nachricht --------
> Datum: Mon, 28 Apr 2008 22:41:39 +0200
> Von: Wolfgang Denk <[EMAIL PROTECTED]>
> An: "Sascha Laue" <[EMAIL PROTECTED]>
> CC: [EMAIL PROTECTED], u-boot-users@lists.sourceforge.net, [EMAIL PROTECTED]
> Betreff: Re: [U-Boot-Users] [PATCH] lwmon5 dspic POST spezification
> In message <[EMAIL PROTECTED]> you wrote:
> >
> > sorry but it's the first time for me.
> > let's try again.
> >
> > we modified the specification for the lwmon5 board dspic POST.
> > Additionally I have add defines for the temperature- and voltagevalues.
> >
> > Signed-off-by: Sascha Laue <[EMAIL PROTECTED]>
> > ---
> > post/board/lwmon5/sysmon.c | 39
> ++++++++++++++++++++++++++++++---------
> > 1 files changed, 30 insertions(+), 9 deletions(-)
>
> Applied, thanks.
>
> Best regards,
>
> Wolfgang Denk
>
> --
> DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
> Committee, n.: A group of men who individually can do nothing but as
> a group decide that nothing can be done. - Fred Allen
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
