diff options
| author | Michal Simek <monstr@monstr.eu> | 2012-03-30 06:10:03 -0400 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2012-03-30 06:10:03 -0400 |
| commit | 6a4770e335bd4df0a4577146f76e116ab6e23f40 (patch) | |
| tree | 305056c20b6ccf3a4fed00e9e32f3a1dd039cd70 /arch/microblaze/kernel/timer.c | |
| parent | ac64a9caa55bdfd8d24784f25c68cb7919ddabe3 (diff) | |
| parent | f52b69f86e27903d6896ed5fa7cd280fec8de532 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'arch/microblaze/kernel/timer.c')
| -rw-r--r-- | arch/microblaze/kernel/timer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c index cadfd5608afb..522defa7d41f 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <asm/setup.h> | 27 | #include <asm/setup.h> |
| 28 | #include <asm/prom.h> | 28 | #include <asm/prom.h> |
| 29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
| 30 | #include <asm/system.h> | ||
| 31 | #include <linux/cnt32_to_63.h> | 30 | #include <linux/cnt32_to_63.h> |
| 32 | 31 | ||
| 33 | #ifdef CONFIG_SELFMOD_TIMER | 32 | #ifdef CONFIG_SELFMOD_TIMER |