diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-01 17:54:14 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-01 17:54:14 +0200 |
| commit | afdef69c7ff7d0bf59e3cafc187aefb12878dbe3 (patch) | |
| tree | 6b8e341c9a25b3e66d6e8027a03c76afd6508d0d /arch/sparc/kernel/central.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | sparc32: Pass task_struct to schedule_tail() in ret_from_fork (diff) | |
| download | linux-afdef69c7ff7d0bf59e3cafc187aefb12878dbe3.tar.xz linux-afdef69c7ff7d0bf59e3cafc187aefb12878dbe3.zip | |
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/central.c')
| -rw-r--r-- | arch/sparc/kernel/central.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/central.c b/arch/sparc/kernel/central.c index 136d3718a74a..7eef3f741963 100644 --- a/arch/sparc/kernel/central.c +++ b/arch/sparc/kernel/central.c @@ -140,7 +140,7 @@ out_free: goto out; } -static struct of_device_id __initdata clock_board_match[] = { +static const struct of_device_id clock_board_match[] = { { .name = "clock-board", }, @@ -245,7 +245,7 @@ out_free: goto out; } -static struct of_device_id __initdata fhc_match[] = { +static const struct of_device_id fhc_match[] = { { .name = "fhc", }, |