]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4d9959 b3aa111)
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 8 Apr 2010 09:47:05 +0000 (10:47 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 8 Apr 2010 09:47:05 +0000 (10:47 +0100)
Conflicts:
arch/arm/mach-mx3/mach-pcm037.c

1  2 
arch/arm/mach-mx3/mach-pcm037.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-mx3/mach-pcm037.c
index 034ec81900657d9b8880d39963c4008b4b7f208a,a550ae9e16372332b96ec9ae4dcf73e51e388e87..2df1ec55a97e6565980b27fd0ade0754921b20e1
--- 1/arch/arm/mach-mx3/mach-pcm037.c
--- 2/arch/arm/mach-mx3/mach-pcm037.c
+++ b/arch/arm/mach-mx3/mach-pcm037.c
@@@ -35,8 -35,6 +35,7 @@@
  #include <linux/can/platform/sja1000.h>
  #include <linux/usb/otg.h>
  #include <linux/usb/ulpi.h>
- #include <linux/fsl_devices.h>
 +#include <linux/gfp.h>
  
  #include <media/soc_camera.h>
  
Clone of davem's net-next-2.6 tree