diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 20:26:59 +0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 20:26:59 +0400 |
| commit | 363e065c02b1273364d5356711a83e7f548fc0c8 (patch) | |
| tree | 0df0e65da403ade33ade580c2770c97437b1b1af /drivers/net/dl2k.h | |
| parent | 907b9bceb41fa46beae93f79cc4a2247df502c0f (diff) | |
| parent | 7c250413e5b7c3dfae89354725b70c76d7621395 (diff) | |
| download | linux-363e065c02b1273364d5356711a83e7f548fc0c8.tar.xz | |
[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/dl2k.h')
| -rw-r--r-- | drivers/net/dl2k.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/dl2k.h b/drivers/net/dl2k.h index 53449207e53b..814c449c359f 100644 --- a/drivers/net/dl2k.h +++ b/drivers/net/dl2k.h @@ -1,5 +1,5 @@ /* D-Link DL2000-based Gigabit Ethernet Adapter Linux driver */ -/* +/* Copyright (c) 2001, 2002 by D-Link Corporation Written by Edward Peng.<edward_peng@dlink.com.tw> Created 03-May-2001, base on Linux' sundance.c. @@ -216,7 +216,7 @@ enum MACCtrl_bits { enum ASICCtrl_LoWord_bits { PhyMedia = 0x0080, }; - + enum ASICCtrl_HiWord_bits { GlobalReset = 0x0001, RxReset = 0x0002, @@ -596,7 +596,7 @@ typedef union t_PCS_ANLPAR { } ANLPAR_PCS_t, *PANLPAR_PCS_t; enum _pcs_anlpar { - PCS_ANLPAR_NEXT_PAGE = PCS_ANAR_NEXT_PAGE, + PCS_ANLPAR_NEXT_PAGE = PCS_ANAR_NEXT_PAGE, PCS_ANLPAR_REMOTE_FAULT = PCS_ANAR_REMOTE_FAULT, PCS_ANLPAR_ASYMMETRIC = PCS_ANAR_ASYMMETRIC, PCS_ANLPAR_PAUSE = PCS_ANAR_PAUSE, |