Olof Johansson 823bba8ff1 ARM: tegra: fix mismerges of header file inclusions ...

Another mishandled merge conflict by me, where the header file renames
and the removal of gpio includes clashed and I chose the wrong end result.

Fixes build breakage for tegra_defconfig.

Signed-off-by: Olof Johansson <olof@lixom.net>

2012-10-07 07:02:06 -07:00

..

card

Merge branch 'depends/tty-omap-serial' into next/cleanup

2012-09-16 20:04:39 -07:00

core

Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

2012-10-02 09:54:49 -07:00

host

ARM: tegra: fix mismerges of header file inclusions

2012-10-07 07:02:06 -07:00

Kconfig

mmc: explicitly mention SDIO support in Kconfig

2008-10-12 11:04:36 +02:00

Makefile

mmc: sdhci-pci: add platform data

2012-01-11 23:58:47 -05:00