diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-23 02:26:18 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-23 02:26:18 +0200 |
| commit | cdb7532f7be35c3675b1aed54d10e378014618b6 (patch) | |
| tree | 925df597b70c4a1de629fec68f9e4ebd3fd9e803 /arch/sh/drivers/pci/pci-st40.h | |
| parent | Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mch... (diff) | |
| parent | sh: Fix dreamcast build for IRQ changes. (diff) | |
| download | linux-cdb7532f7be35c3675b1aed54d10e378014618b6.tar.xz linux-cdb7532f7be35c3675b1aed54d10e378014618b6.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix dreamcast build for IRQ changes.
sh: Fix clock multiplier on SH7722.
sh: Wire up kdump crash kernel exec in die().
sh: sr.bl toggling around idle sleep.
sh: disable genrtc support.
fs: Kill sh dependency for binfmt_flat.
sh: Disable psw support for R7785RP.
sh: Fix page size alignment in __copy_user_page().
sh: Fix up various compile warnings for SE boards.
sh: Wire up signalfd/timerfd/eventfd syscalls.
sh: revert addition of page fault notifiers
spelling fixes: arch/sh/
input: hp680_ts compile fixes.
sh: landisk: Header cleanups.
sh: landisk: rtc-rs5c313 support.
sh: Kill off pmb slab cache destructor.
sh: Fix up psw build rules for r7780rp.
sh: Shut up compiler warnings in __do_page_fault().
Diffstat (limited to 'arch/sh/drivers/pci/pci-st40.h')
| -rw-r--r-- | arch/sh/drivers/pci/pci-st40.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/drivers/pci/pci-st40.h b/arch/sh/drivers/pci/pci-st40.h index d729e0c2d5fe..cf0d35bd135c 100644 --- a/arch/sh/drivers/pci/pci-st40.h +++ b/arch/sh/drivers/pci/pci-st40.h @@ -4,7 +4,7 @@ * May be copied or modified under the terms of the GNU General Public * License. See linux/COPYING for more information. * - * Defintions for the ST40 PCI hardware. + * Definitions for the ST40 PCI hardware. */ #ifndef __PCI_ST40_H__ |