summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/generic.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-11-01 15:51:32 +0000
committerAnton Altaparmakov <aia21@cantab.net>2005-11-01 15:51:32 +0000
commit94b166a7cbc232df279e1f7d5a8acfb6b8d02d59 (patch)
tree5cf9a982d3ffe9fde7a1ac679eb994499c09f7f2 /arch/arm/mach-imx/generic.c
parent3aebf25bdcf030f3e4afeb9340486d5b46deb46e (diff)
parent1e4c85f97fe26fbd70da12148b3992c0e00361fd (diff)
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'arch/arm/mach-imx/generic.c')
-rw-r--r--arch/arm/mach-imx/generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/generic.c b/arch/arm/mach-imx/generic.c
index 837d7f0bda4..37613ad6836 100644
--- a/arch/arm/mach-imx/generic.c
+++ b/arch/arm/mach-imx/generic.c
@@ -22,7 +22,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
-#include <linux/device.h>
+#include <linux/platform_device.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>