diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /arch/blackfin/kernel/time-ts.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'arch/blackfin/kernel/time-ts.c')
| -rw-r--r-- | arch/blackfin/kernel/time-ts.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c index f9715764383e..359cfb1815ca 100644 --- a/arch/blackfin/kernel/time-ts.c +++ b/arch/blackfin/kernel/time-ts.c | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/kernel/time-ts.c | ||
| 3 | * | ||
| 4 | * Based on arm clockevents implementation and old bfin time tick. | 2 | * Based on arm clockevents implementation and old bfin time tick. |
| 5 | * | 3 | * |
| 6 | * Copyright(C) 2008, GeoTechnologies, Vitja Makarov | 4 | * Copyright 2008-2009 Analog Devics Inc. |
| 5 | * 2008 GeoTechnologies | ||
| 6 | * Vitja Makarov | ||
| 7 | * | 7 | * |
| 8 | * This code is licenced under the GPL version 2. For details see | 8 | * Licensed under the GPL-2 |
| 9 | * kernel-base/COPYING. | ||
| 10 | */ | 9 | */ |
| 10 | |||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/profile.h> | 12 | #include <linux/profile.h> |
| 13 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |