diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 12:26:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 12:26:59 -0400 |
| commit | 363e065c02b1273364d5356711a83e7f548fc0c8 (patch) | |
| tree | 0df0e65da403ade33ade580c2770c97437b1b1af /drivers/net/cs89x0.h | |
| parent | 907b9bceb41fa46beae93f79cc4a2247df502c0f (diff) | |
| parent | 7c250413e5b7c3dfae89354725b70c76d7621395 (diff) | |
[GFS2] Fix up merge of Linus' kernel into GFS2
This fixes up a couple of conflicts when merging up with
Linus' latest kernel. This will hopefully allow GFS2 to
be more easily merged into forthcoming -mm and FC kernels
due to the "one line per header" format now used for the
kernel headers.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Conflicts:
include/linux/Kbuild
include/linux/kernel.h
Diffstat (limited to 'drivers/net/cs89x0.h')
| -rw-r--r-- | drivers/net/cs89x0.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cs89x0.h b/drivers/net/cs89x0.h index 968fe11a0bf0..204ed37fa9d5 100644 --- a/drivers/net/cs89x0.h +++ b/drivers/net/cs89x0.h @@ -427,8 +427,8 @@ #define DMA_SIZE (16*1024) /* Size of dma buffer - 16k */ #define CS8900 0x0000 -#define CS8920 0x4000 -#define CS8920M 0x6000 +#define CS8920 0x4000 +#define CS8920M 0x6000 #define REVISON_BITS 0x1F00 #define EEVER_NUMBER 0x12 #define CHKSUM_LEN 0x14 |