diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-23 05:10:28 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-23 05:10:30 -0400 |
| commit | 70bce3ba77540ebe77b8c0e1ac38d281a23fbb5e (patch) | |
| tree | 34b09a49228f0949ff49dce66a433b0dfd83a2dc /arch/arm/mach-mx3/mach-pcm037.c | |
| parent | 6eca8cc35b50af1037bc919106dd6dd332c959c2 (diff) | |
| parent | d5a30458a90597915977f06e79406b664a41b8ac (diff) | |
Merge branch 'linus' into perf/core
Merge reason: merge the latest fixes, update to latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-mx3/mach-pcm037.c')
| -rw-r--r-- | arch/arm/mach-mx3/mach-pcm037.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c index 034ec8190065..2df1ec55a97e 100644 --- a/arch/arm/mach-mx3/mach-pcm037.c +++ b/arch/arm/mach-mx3/mach-pcm037.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <linux/can/platform/sja1000.h> | 35 | #include <linux/can/platform/sja1000.h> |
| 36 | #include <linux/usb/otg.h> | 36 | #include <linux/usb/otg.h> |
| 37 | #include <linux/usb/ulpi.h> | 37 | #include <linux/usb/ulpi.h> |
| 38 | #include <linux/fsl_devices.h> | ||
| 39 | #include <linux/gfp.h> | 38 | #include <linux/gfp.h> |
| 40 | 39 | ||
| 41 | #include <media/soc_camera.h> | 40 | #include <media/soc_camera.h> |