git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regulator
[pandora-kernel.git]
/
arch
/
arm
/
mach-tegra
/
board-trimslice-pinmux.c
diff --git
a/arch/arm/mach-tegra/board-trimslice-pinmux.c
b/arch/arm/mach-tegra/board-trimslice-pinmux.c
index
47c596c
..
bcb1916
100644
(file)
--- a/
arch/arm/mach-tegra/board-trimslice-pinmux.c
+++ b/
arch/arm/mach-tegra/board-trimslice-pinmux.c
@@
-13,12
+13,11
@@
* GNU General Public License for more details.
*
*/
-
+#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <mach/pinmux.h>
-#include <mach/gpio.h>
#include "gpio-names.h"
#include "board-trimslice.h"