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://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
arch
/
arm
/
mach-tegra
/
board-paz00-pinmux.c
diff --git
a/arch/arm/mach-tegra/board-paz00-pinmux.c
b/arch/arm/mach-tegra/board-paz00-pinmux.c
index
fb20894
..
be30e21
100644
(file)
--- a/
arch/arm/mach-tegra/board-paz00-pinmux.c
+++ b/
arch/arm/mach-tegra/board-paz00-pinmux.c
@@
-16,6
+16,8
@@
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/gpio.h>
+#include <linux/of.h>
+
#include <mach/pinmux.h>
#include "gpio-names.h"
#include <mach/pinmux.h>
#include "gpio-names.h"
@@
-158,7
+160,9
@@
static struct tegra_gpio_table gpio_table[] = {
void paz00_pinmux_init(void)
{
void paz00_pinmux_init(void)
{
- platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices));
+ if (!of_machine_is_compatible("nvidia,tegra20"))
+ platform_add_devices(pinmux_devices,
+ ARRAY_SIZE(pinmux_devices));
tegra_pinmux_config_table(paz00_pinmux, ARRAY_SIZE(paz00_pinmux));
tegra_pinmux_config_table(paz00_pinmux, ARRAY_SIZE(paz00_pinmux));