diff options
author | 2006-09-25 12:26:59 -0400 | |
---|---|---|
committer | 2006-09-25 12:26:59 -0400 | |
commit | 363e065c02b1273364d5356711a83e7f548fc0c8 (patch) | |
tree | 0df0e65da403ade33ade580c2770c97437b1b1af /drivers/net/seeq8005.h | |
parent | [GFS2/DLM] Fix trailing whitespace (diff) | |
parent | [PATCH] pata_pdc2027x iomem annotations (diff) | |
download | linux-dev-363e065c02b1273364d5356711a83e7f548fc0c8.tar.xz linux-dev-363e065c02b1273364d5356711a83e7f548fc0c8.zip |
[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/seeq8005.h')
-rw-r--r-- | drivers/net/seeq8005.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/seeq8005.h b/drivers/net/seeq8005.h index 809ba6dc8fb9..5dfb0098c6ca 100644 --- a/drivers/net/seeq8005.h +++ b/drivers/net/seeq8005.h @@ -1,7 +1,7 @@ -/* +/* * defines, etc for the seeq8005 */ - + /* * This file is distributed under GPL. * |