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/ide/ht6560b.c | |
| 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/ide/ht6560b.c')
| -rw-r--r-- | drivers/ide/ht6560b.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ht6560b.c b/drivers/ide/ht6560b.c index d81e49680c3f..808bcdcbf8e1 100644 --- a/drivers/ide/ht6560b.c +++ b/drivers/ide/ht6560b.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Author: Mikko Ala-Fossi <maf@iki.fi> | 10 | * Author: Mikko Ala-Fossi <maf@iki.fi> |
| 11 | * Jan Evert van Grootheest <j.e.van.grootheest@caiway.nl> | 11 | * Jan Evert van Grootheest <j.e.van.grootheest@caiway.nl> |
| 12 | * | 12 | * |
| 13 | * Try: http://www.maf.iki.fi/~maf/ht6560b/ | ||
| 14 | */ | 13 | */ |
| 15 | 14 | ||
| 16 | #define DRV_NAME "ht6560b" | 15 | #define DRV_NAME "ht6560b" |