diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-27 13:34:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-27 13:34:09 -0500 |
| commit | c816d7c64e82cae69fa5c7365474d37444a97ccf (patch) | |
| tree | 19db5f3f47f7e6d65f8e35fcc0faa465f8c998fc /drivers | |
| parent | b094a870ae33426442b0cbcf8025f1ef919d1def (diff) | |
| parent | 30f2ba38011247ad95bffbf0743a0dc0656a5eb7 (diff) | |
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: intc: Initialize radix tree gfp mask explicitly.
sh: Fix up SH7201 clkfwk build.
sh: mach-se: Fix up SE7206 build.
sh: Fix up SH4-202 clkfwk build.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/sh/intc/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c index e5e9e6735f7d..9739431092d1 100644 --- a/drivers/sh/intc/core.c +++ b/drivers/sh/intc/core.c | |||
| @@ -198,6 +198,7 @@ int __init register_intc_controller(struct intc_desc *desc) | |||
| 198 | list_add_tail(&d->list, &intc_list); | 198 | list_add_tail(&d->list, &intc_list); |
| 199 | 199 | ||
| 200 | raw_spin_lock_init(&d->lock); | 200 | raw_spin_lock_init(&d->lock); |
| 201 | INIT_RADIX_TREE(&d->tree, GFP_ATOMIC); | ||
| 201 | 202 | ||
| 202 | d->index = nr_intc_controllers; | 203 | d->index = nr_intc_controllers; |
| 203 | 204 | ||