diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-01 11:54:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-01 11:54:14 -0400 |
| commit | afdef69c7ff7d0bf59e3cafc187aefb12878dbe3 (patch) | |
| tree | 6b8e341c9a25b3e66d6e8027a03c76afd6508d0d /arch/sparc/kernel/pci_psycho.c | |
| parent | 84daeb09ef2b11cb0b29e100766e38e206c8bc47 (diff) | |
| parent | 47c7c97a93a5b8f719093dbf83555090b3b8228b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc32: Pass task_struct to schedule_tail() in ret_from_fork
apbuart: Depend upon sparc.
sparc64: Fix section mis-match errors.
sparc32,leon: Fixed APBUART frequency detection
sparc32, leon: APBUART driver must use archdata to get IRQ number
sparc: Hook up syncfs system call.
Diffstat (limited to 'arch/sparc/kernel/pci_psycho.c')
| -rw-r--r-- | arch/sparc/kernel/pci_psycho.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/pci_psycho.c b/arch/sparc/kernel/pci_psycho.c index 56ee745064de..86ae08d9b6ee 100644 --- a/arch/sparc/kernel/pci_psycho.c +++ b/arch/sparc/kernel/pci_psycho.c | |||
| @@ -592,7 +592,7 @@ out_err: | |||
| 592 | return err; | 592 | return err; |
| 593 | } | 593 | } |
| 594 | 594 | ||
| 595 | static struct of_device_id __initdata psycho_match[] = { | 595 | static const struct of_device_id psycho_match[] = { |
| 596 | { | 596 | { |
| 597 | .name = "pci", | 597 | .name = "pci", |
| 598 | .compatible = "pci108e,8000", | 598 | .compatible = "pci108e,8000", |