diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:28 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:28 -0500 |
| commit | 7df4edb07cf54a4868b9a750424c0d2aa68f8d66 (patch) | |
| tree | 0ad0ad3f3dcb6f9edf26dde42ba625053dddf54f /arch/sh/kernel/cpu/sh4a/setup-sh7722.c | |
| parent | 0d688da5505d77bcef2441e0a22d8cc26459702d (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/setup-sh7722.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c index 50cf6838ec41..5146afc156e0 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | |||
| @@ -158,7 +158,7 @@ static struct resource jpu_resources[] = { | |||
| 158 | [0] = { | 158 | [0] = { |
| 159 | .name = "JPU", | 159 | .name = "JPU", |
| 160 | .start = 0xfea00000, | 160 | .start = 0xfea00000, |
| 161 | .end = 0xfea102d0, | 161 | .end = 0xfea102d3, |
| 162 | .flags = IORESOURCE_MEM, | 162 | .flags = IORESOURCE_MEM, |
| 163 | }, | 163 | }, |
| 164 | [1] = { | 164 | [1] = { |