projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus'
[powerpc.git]
/
drivers
/
net
/
hamachi.c
diff --git
a/drivers/net/hamachi.c
b/drivers/net/hamachi.c
index
d9df1d9
..
0ea4cb4
100644
(file)
--- a/
drivers/net/hamachi.c
+++ b/
drivers/net/hamachi.c
@@
-204,6
+204,10
@@
KERN_INFO " Further modifications by Keith Underwood <keithu@parl.clemson.edu>
#define RUN_AT(x) (jiffies + (x))
#define RUN_AT(x) (jiffies + (x))
+#ifndef ADDRLEN
+#define ADDRLEN 32
+#endif
+
/* Condensed bus+endian portability operations. */
#if ADDRLEN == 64
#define cpu_to_leXX(addr) cpu_to_le64(addr)
/* Condensed bus+endian portability operations. */
#if ADDRLEN == 64
#define cpu_to_leXX(addr) cpu_to_le64(addr)
@@
-423,7
+427,7
@@
that case.
static void hamachi_timer(unsigned long data);
enum capability_flags {CanHaveMII=1, };
static void hamachi_timer(unsigned long data);
enum capability_flags {CanHaveMII=1, };
-static struct chip_info {
+static
const
struct chip_info {
u16 vendor_id, device_id, device_id_mask, pad;
const char *name;
void (*media_timer)(unsigned long data);
u16 vendor_id, device_id, device_id_mask, pad;
const char *name;
void (*media_timer)(unsigned long data);