ARM: tegra: fix mismerges of header file inclusions