]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3670e5d) | patch
ARM: tegra: fix mismerges of header file inclusions
authorOlof Johansson <olof@lixom.net>
Sat, 22 Sep 2012 18:08:03 +0000 (11:08 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 7 Oct 2012 14:02:06 +0000 (07:02 -0700)
commit51a5236ab7b19a2d1faf2a0ed8de9d00d2e01538
treeba2108e91bc53cc39e4cb52b1349b4923f361ecatree | snapshot
parent3670e5df27104c1ef2d389c8390d6e031ecdba4ccommit | diff
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>
drivers/mmc/host/sdhci-tegra.c diff | blob | history
Linux Kernel Source Tree.