Skip to content

Commit

Permalink
Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawn…
Browse files Browse the repository at this point in the history
…guo/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>
  • Loading branch information
Arnd Bergmann committed Jul 6, 2012
2 parents a06347d + f1cefa8 commit c16b4c1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/mach-mxs/module-tx28.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit c16b4c1

Please sign in to comment.