diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
| commit | 3505d1a9fd65e2d3e00827857b6795d9d8983658 (patch) | |
| tree | 941cfafdb57c427bb6b7ebf6354ee93b2a3693b5 /arch/blackfin/kernel/time-ts.c | |
| parent | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (diff) | |
| parent | 66b00a7c93ec782d118d2c03bd599cfd041e80a1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/rtl8187se/Kconfig
drivers/staging/rtl8192e/Kconfig
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> |