diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-02 22:02:55 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-02 22:03:08 +0400 |
| commit | c9494727cf293ae2ec66af57547a3e79c724fec2 (patch) | |
| tree | 44ae197b64fa7530ee695a90ad31326dda06f1e1 /arch/arm/mach-mx25/devices.h | |
| parent | 6427462bfa50f50dc6c088c07037264fcc73eca1 (diff) | |
| parent | 42be79e37e264557f12860fa4cc84b4de3685954 (diff) | |
| download | linux-c9494727cf293ae2ec66af57547a3e79c724fec2.tar.xz | |
Merge branch 'linus' into sched/core
Merge reason: update to latest upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-mx25/devices.h')
| -rw-r--r-- | arch/arm/mach-mx25/devices.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-mx25/devices.h b/arch/arm/mach-mx25/devices.h index fe5420fcd11f..39560e13bc0d 100644 --- a/arch/arm/mach-mx25/devices.h +++ b/arch/arm/mach-mx25/devices.h @@ -18,3 +18,6 @@ extern struct platform_device mxc_i2c_device0; extern struct platform_device mxc_i2c_device1; extern struct platform_device mxc_i2c_device2; extern struct platform_device mx25_fec_device; +extern struct platform_device mxc_nand_device; +extern struct platform_device mx25_rtc_device; +extern struct platform_device mx25_fb_device; |