Dear "Graeme Russ",
In message d66caabb0809060634w22062fd5gc171c76ed59c889c@mail.gmail.com you wrote:
Attempt to bring i386 / sc520 inline with master
NOTE: Previous patches have been rejected by the mailing list due to non-ASCII characters in the copyright headers. I have deleted the offending characters - I hope patch does not complain
You patch will not apply if you just try and omit such characters.
Also, your patch is severely corrupted. It seems you copy & pasted it and lost a lot of the original white spaces then.
Signed-off-by: Graeme Russ graeme.russ@gmail.com
diff --git a/board/sc520_cdp/sc520_cdp.c b/board/sc520_cdp/sc520_cdp.c index f21c730..20284e4 100644 --- a/board/sc520_cdp/sc520_cdp.c +++ b/board/sc520_cdp/sc520_cdp.c @@ -1,7 +1,7 @@ /*
- (C) Copyright 2002
- Daniel Engstrm, Omicron Ceti AB daniel@omicron.se.
- Daniel Engstrm, Omicron Ceti AB daniel@omicron.se.
Does not apply. The original line is
* Daniel Engström, Omicron Ceti AB daniel@omicron.se.
Note there is a character (o-umlaut) between the 'r' and the 'm' in Engström.
- Serial EEPROM opcodes, including start bit
diff --git a/examples/82559_eeprom.c b/examples/82559_eeprom.c index 1a121d4..d99af26 100644 --- a/examples/82559_eeprom.c +++ b/examples/82559_eeprom.c @@ -51,13 +51,17 @@ static inline unsigned short swap16(unsigned short x) }
-static inline void *memcpy(void *dst, const void *src, unsigned int len) +void * memcpy(void * dest,const void *src,size_t count) {
- void * ret = dst;
- while (len-- > 0) *((char *)dst)++ = *((char *)src)++;
- return ret;
- char *tmp = (char *) dest, *s = (char *) src;
- while (count--)
- *tmp++ = *s++;
- return dest;
}
Indentation incorrect.
/* The EEPROM commands include the alway-set leading bit. */ #define EE_WRITE_CMD (5) #define EE_READ_CMD (6) @@ -156,7 +160,7 @@ static int reset_eeprom(unsigned long ioaddr, unsigned char *hwaddr) int size_test; int i;
- printf("Resetting i82559 EEPROM @ 0x%08x ... ", ioaddr);
- printf("Resetting i82559 EEPROM @ 0x%08lx ... ", ioaddr);
Indentation incorrect.
size_test = do_eeprom_cmd(ioaddr, (EE_READ_CMD << 8) << 16, 27); eeprom_addr_size = (size_test & 0xffe0000) == 0xffe0000 ? 8 : 6; @@ -305,7 +309,7 @@ write_config_word(int bus, int dev, int func, int reg, u16 data) int main (int argc, char *argv[]) { unsigned char *eth_addr;
- char buf[6];
- uchar buf[6];
int instance;
Indentation incorrect.
app_startup(argv); diff --git a/include/asm-i386/byteorder.h b/include/asm-i386/byteorder.h index a9c69d5..7dfeb8b 100644 --- a/include/asm-i386/byteorder.h +++ b/include/asm-i386/byteorder.h @@ -6,7 +6,7 @@ #ifdef __GNUC__
-static __inline__ __const__ __u32 ___arch__swab32(__u32 x) +static __inline__ __u32 ___arch__swab32(__u32 x) { #ifdef CONFIG_X86_BSWAP __asm__("bswap %0" : "=r" (x) : "0" (x)); @@ -20,7 +20,7 @@ static __inline__ __const__ __u32 ___arch__swab32(__u32 x) return x; }
-static __inline__ __const__ __u16 ___arch__swab16(__u16 x) +static __inline__ __u16 ___arch__swab16(__u16 x) { __asm__("xchgb %b0,%h0" /* swap bytes */ \ : "=q" (x) \
Ditto.
and so on an on.
Best regards,
Wolfgang Denk