summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx25/devices.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-02-02 14:38:15 +0900
committerTejun Heo <tj@kernel.org>2010-02-02 14:38:15 +0900
commitab386128f20c44c458a90039ab1bdc265ac474c9 (patch)
tree2ad188744922b1bb951fd10ff50dc04c83acce22 /arch/arm/mach-mx25/devices.h
parentdbfc196a3cc1a2514ad0737a82f764de23bd65e6 (diff)
parentab658321f32770b903a4426e2a6fae0392757755 (diff)
downloadblackbird-op-linux-ab386128f20c44c458a90039ab1bdc265ac474c9.tar.gz
blackbird-op-linux-ab386128f20c44c458a90039ab1bdc265ac474c9.zip
Merge branch 'master' into percpu
Diffstat (limited to 'arch/arm/mach-mx25/devices.h')
-rw-r--r--arch/arm/mach-mx25/devices.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mx25/devices.h b/arch/arm/mach-mx25/devices.h
index fe6bf88ad1dd..fe5420fcd11f 100644
--- a/arch/arm/mach-mx25/devices.h
+++ b/arch/arm/mach-mx25/devices.h
@@ -17,3 +17,4 @@ extern struct platform_device mxc_keypad_device;
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;
OpenPOWER on IntegriCloud