Commit c16b4c1a authored Jul 06, 2012 by Arnd Bergmann

Merge branch 'mxs/fixes-for-3.6' of...

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>

parents a06347d0 f1cefa85

arch/arm/mach-mxs/module-tx28.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"