diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 13:08:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 13:08:33 -0400 |
| commit | d3d07d941fd80c173b6d690ded00ee5fb8302e06 (patch) | |
| tree | f1a82c956e393df9933c8544bb564ef1735384ee /arch/sh/kernel/io.c | |
| parent | 6cd8e300b49332eb9eeda45816c711c198d31505 (diff) | |
| parent | 54ff328b46e58568c4b3350c2fa3223ef862e5a4 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (266 commits)
sh: Tie sparseirq in to Kconfig.
sh: Wire up sys_rt_tgsigqueueinfo.
sh: Fix sys_pwritev() syscall table entry for sh32.
sh: Fix sh4a llsc-based cmpxchg()
sh: sh7724: Add JPU support
sh: sh7724: INTC setting update
sh: sh7722 clock framework rewrite
sh: sh7366 clock framework rewrite
sh: sh7343 clock framework rewrite
sh: sh7724 clock framework rewrite V3
sh: sh7723 clock framework rewrite V2
sh: add enable()/disable()/set_rate() to div6 code
sh: add AP325RXA mode pin configuration
sh: add Migo-R mode pin configuration
sh: sh7722 mode pin definitions
sh: sh7724 mode pin comments
sh: sh7723 mode pin V2
sh: rework mode pin code
sh: clock div6 helper code
sh: clock div4 frequency table offset fix
...
Diffstat (limited to 'arch/sh/kernel/io.c')
| -rw-r--r-- | arch/sh/kernel/io.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/kernel/io.c b/arch/sh/kernel/io.c index 29cf4588fc05..4f85fffaa557 100644 --- a/arch/sh/kernel/io.c +++ b/arch/sh/kernel/io.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | * for more details. | 12 | * for more details. |
| 13 | */ | 13 | */ |
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/pci.h> | ||
| 15 | #include <asm/machvec.h> | 16 | #include <asm/machvec.h> |
| 16 | #include <asm/io.h> | 17 | #include <asm/io.h> |
| 17 | 18 | ||