diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /arch/arm/mach-at91/include/mach/at91_pit.h | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'arch/arm/mach-at91/include/mach/at91_pit.h')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91_pit.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91_pit.h b/arch/arm/mach-at91/include/mach/at91_pit.h index 0448ac36eadb..974d0bd05b5b 100644 --- a/arch/arm/mach-at91/include/mach/at91_pit.h +++ b/arch/arm/mach-at91/include/mach/at91_pit.h | |||
| @@ -1,6 +1,9 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/mach-at91/include/mach/at91_pit.h | 2 | * arch/arm/mach-at91/include/mach/at91_pit.h |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2007 Andrew Victor | ||
| 5 | * Copyright (C) 2007 Atmel Corporation. | ||
| 6 | * | ||
| 4 | * Periodic Interval Timer (PIT) - System peripherals regsters. | 7 | * Periodic Interval Timer (PIT) - System peripherals regsters. |
| 5 | * Based on AT91SAM9261 datasheet revision D. | 8 | * Based on AT91SAM9261 datasheet revision D. |
| 6 | * | 9 | * |