diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/sgiseeq.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/sgiseeq.h')
| -rw-r--r-- | drivers/net/sgiseeq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sgiseeq.h b/drivers/net/sgiseeq.h index 523104de6830..2211e2987a8d 100644 --- a/drivers/net/sgiseeq.h +++ b/drivers/net/sgiseeq.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * sgiseeq.h: Defines for the Seeq8003 ethernet controller. | 2 | * sgiseeq.h: Defines for the Seeq8003 ethernet controller. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 4 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
| 5 | */ | 5 | */ |
| 6 | #ifndef _SGISEEQ_H | 6 | #ifndef _SGISEEQ_H |
| 7 | #define _SGISEEQ_H | 7 | #define _SGISEEQ_H |