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/ni65.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/ni65.h')
| -rw-r--r-- | drivers/net/ni65.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ni65.h b/drivers/net/ni65.h index b01cef1b62c..e6217e35edf 100644 --- a/drivers/net/ni65.h +++ b/drivers/net/ni65.h @@ -1,12 +1,12 @@ /* am7990 (lance) definitions - * + * * This is an extension to the Linux operating system, and is covered by * same GNU General Public License that covers that work. - * + * * Michael Hipp * email: mhipp@student.uni-tuebingen.de * - * sources: (mail me or ask archie if you need them) + * sources: (mail me or ask archie if you need them) * crynwr-packet-driver */ |