diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-08-14 23:59:42 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-14 23:59:42 -0400 |
commit | 60e0a4c7adc700f2d2929cdb2d0055e519a3eb3d (patch) | |
tree | b19755368b6d0f6be3024d972de13f4b48cb025d /arch/sh/boards | |
parent | 180aa6e6aa11922dcd4c13df1967d62bb2ede76c (diff) | |
parent | 237674e050ae8ea40a432412df6c15d60b7ae8a6 (diff) |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sh/boards')
-rw-r--r-- | arch/sh/boards/mach-se/7724/setup.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index 36a4ca3a9000..9162081504ef 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c | |||
@@ -246,7 +246,7 @@ static struct platform_device ceu1_device = { | |||
246 | }, | 246 | }, |
247 | }; | 247 | }; |
248 | 248 | ||
249 | /* KEYSC */ | 249 | /* KEYSC in SoC (Needs SW33-2 set to ON) */ |
250 | static struct sh_keysc_info keysc_info = { | 250 | static struct sh_keysc_info keysc_info = { |
251 | .mode = SH_KEYSC_MODE_1, | 251 | .mode = SH_KEYSC_MODE_1, |
252 | .scan_timing = 10, | 252 | .scan_timing = 10, |
@@ -263,12 +263,13 @@ static struct sh_keysc_info keysc_info = { | |||
263 | 263 | ||
264 | static struct resource keysc_resources[] = { | 264 | static struct resource keysc_resources[] = { |
265 | [0] = { | 265 | [0] = { |
266 | .start = 0x1a204000, | 266 | .name = "KEYSC", |
267 | .end = 0x1a20400f, | 267 | .start = 0x044b0000, |
268 | .end = 0x044b000f, | ||
268 | .flags = IORESOURCE_MEM, | 269 | .flags = IORESOURCE_MEM, |
269 | }, | 270 | }, |
270 | [1] = { | 271 | [1] = { |
271 | .start = IRQ0_KEY, | 272 | .start = 79, |
272 | .flags = IORESOURCE_IRQ, | 273 | .flags = IORESOURCE_IRQ, |
273 | }, | 274 | }, |
274 | }; | 275 | }; |