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/dgrs.h | |
| parent | 907b9bceb41fa46beae93f79cc4a2247df502c0f (diff) | |
| parent | 7c250413e5b7c3dfae89354725b70c76d7621395 (diff) | |
| download | op-kernel-dev-363e065c02b1273364d5356711a83e7f548fc0c8.zip op-kernel-dev-363e065c02b1273364d5356711a83e7f548fc0c8.tar.gz | |
[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/dgrs.h')
| -rw-r--r-- | drivers/net/dgrs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dgrs.h b/drivers/net/dgrs.h index c347cd1..6058d53 100644 --- a/drivers/net/dgrs.h +++ b/drivers/net/dgrs.h @@ -31,8 +31,8 @@ typedef struct dgrs_ioctl { unsigned short filter; /* filter number for command, if needed */ } DGRS_IOCTL; -/* - * Commands for the driver +/* + * Commands for the driver */ #define DGRS_GETMEM 0x01 /* Get the dual port memory address */ #define DGRS_SETFILTER 0x02 /* Set a filter */ |
