diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-07 15:20:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-07 15:20:11 -0800 |
| commit | 65d9055ea39c07671bc41a8cd1ace9aaa6e1bc70 (patch) | |
| tree | 2d0b8a353f6ffa9bf0924ff777f366778ddaa7d6 /arch/arm/mach-imx/mach-mx25_3ds.c | |
| parent | cb5520f02c010e3cb974b9ac06f30aafa2eebc38 (diff) | |
| parent | 1f63b9546a8c7b90de2d9e52cf8ff07f9f653d94 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ALSA: AACI: allow writes to MAINCR to take effect
ARM: Update mach-types
ARM: 6652/1: ep93xx: correct the end address of the AC97 memory resource
ARM: mxs/imx28: remove now unused clock lookup "fec.0"
ARM: mxs: fix clock base address missing
ARM: mxs: acknowledge gpio irq
ARM: mach-imx/mach-mx25_3ds: Fix section type
ARM: imx: Add VPR200 and MX51_3DS entries to uncompress.h
ARM i.MX23: use correct register for setting the rate
ARM i.MX23/28: remove secondary field from struct clk. It's unused
ARM i.MX28: use correct register for setting the rate
ARM i.MX28: fix bit operation
Diffstat (limited to 'arch/arm/mach-imx/mach-mx25_3ds.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx25_3ds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx25_3ds.c b/arch/arm/mach-imx/mach-mx25_3ds.c index aa76cfd9f34..8382e790207 100644 --- a/arch/arm/mach-imx/mach-mx25_3ds.c +++ b/arch/arm/mach-imx/mach-mx25_3ds.c @@ -180,7 +180,7 @@ static const uint32_t mx25pdk_keymap[] = { KEY(3, 3, KEY_POWER), }; -static const struct matrix_keymap_data mx25pdk_keymap_data __initdata = { +static const struct matrix_keymap_data mx25pdk_keymap_data __initconst = { .keymap = mx25pdk_keymap, .keymap_size = ARRAY_SIZE(mx25pdk_keymap), }; |