Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/fixes-non-critical · c16b4c1af3 - Gogs

Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/fixes-non-critical

From Shawn Guo <shawn.guo@linaro.org>:

* 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs/tx28: fix odd include

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 13 years ago

parent

a06347d0ca f1cefa855f

commit

c16b4c1af3

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
arch/arm/mach-mxs/module-tx28.c
							 
								View File
							
				@@ -11,7 +11,7 @@
			
				 #include <linux/gpio.h>
			
				 #include <mach/iomux-mx28.h>
			
				-#include "../devices-mx28.h"
			
				+#include "devices-mx28.h"
			
				 #include "module-tx28.h"