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 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into...
[pandora-kernel.git]
/
arch
/
arm
/
mach-tegra
/
board-trimslice.c
diff --git
a/arch/arm/mach-tegra/board-trimslice.c
b/arch/arm/mach-tegra/board-trimslice.c
index
8489aa8
..
1a6617b
100644
(file)
--- a/
arch/arm/mach-tegra/board-trimslice.c
+++ b/
arch/arm/mach-tegra/board-trimslice.c
@@
-32,7
+32,6
@@
#include <mach/iomap.h>
#include <mach/sdhci.h>
#include <mach/iomap.h>
#include <mach/sdhci.h>
-#include <mach/gpio.h>
#include "board.h"
#include "clock.h"
#include "board.h"
#include "clock.h"
@@
-46,7
+45,8
@@
static struct plat_serial8250_port debug_uart_platform_data[] = {
.membase = IO_ADDRESS(TEGRA_UARTA_BASE),
.mapbase = TEGRA_UARTA_BASE,
.irq = INT_UARTA,
.membase = IO_ADDRESS(TEGRA_UARTA_BASE),
.mapbase = TEGRA_UARTA_BASE,
.irq = INT_UARTA,
- .flags = UPF_BOOT_AUTOCONF,
+ .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
+ .type = PORT_TEGRA,
.iotype = UPIO_MEM,
.regshift = 2,
.uartclk = 216000000,
.iotype = UPIO_MEM,
.regshift = 2,
.uartclk = 216000000,
@@
-126,8
+126,8
@@
static void trimslice_usb_init(void)
platform_device_register(&tegra_ehci1_device);
}
platform_device_register(&tegra_ehci1_device);
}
-static void __init tegra_trimslice_fixup(struct
machine_desc *desc
,
- struct
tag *tags, char **cmdline, struct
meminfo *mi)
+static void __init tegra_trimslice_fixup(struct
tag *tags, char **cmdline
,
+ struct meminfo *mi)
{
mi->nr_banks = 2;
mi->bank[0].start = PHYS_OFFSET;
{
mi->nr_banks = 2;
mi->bank[0].start = PHYS_OFFSET;