diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 15:32:20 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 15:32:20 +0900 |
| commit | 9fb4c7fbbcb1e947567d13b82e429ae47a46e337 (patch) | |
| tree | 6c5f11f347d0f58565381f92680a7a9cc63c0bd8 /arch/arm/mach-mx5/devices-imx50.h | |
| parent | dc3e5b6a6e842116ec2436161adf31877f09b6b9 (diff) | |
| parent | d762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-mx5/devices-imx50.h')
| -rw-r--r-- | arch/arm/mach-mx5/devices-imx50.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mx5/devices-imx50.h b/arch/arm/mach-mx5/devices-imx50.h index c9e42823c7e..7216667eaaf 100644 --- a/arch/arm/mach-mx5/devices-imx50.h +++ b/arch/arm/mach-mx5/devices-imx50.h @@ -21,14 +21,14 @@ #include <mach/mx50.h> #include <mach/devices-common.h> -extern const struct imx_imx_uart_1irq_data imx50_imx_uart_data[] __initconst; +extern const struct imx_imx_uart_1irq_data imx50_imx_uart_data[]; #define imx50_add_imx_uart(id, pdata) \ imx_add_imx_uart_1irq(&imx50_imx_uart_data[id], pdata) -extern const struct imx_fec_data imx50_fec_data __initconst; +extern const struct imx_fec_data imx50_fec_data; #define imx50_add_fec(pdata) \ imx_add_fec(&imx50_fec_data, pdata) -extern const struct imx_imx_i2c_data imx50_imx_i2c_data[] __initconst; +extern const struct imx_imx_i2c_data imx50_imx_i2c_data[]; #define imx50_add_imx_i2c(id, pdata) \ imx_add_imx_i2c(&imx50_imx_i2c_data[id], pdata) |