Merge branch 'tegra/cleanup' into next/cleanup

Browse source

* tegra/cleanup:
  arm/tegra: Remove code that's ifndef CONFIG_ARM_GIC
  arm/tegra: remove unused defines
  arm/tegra: fix variable formatting in makefile

Conflicts:
	arch/arm/mach-tegra/include/mach/entry-macro.S

...

This commit is contained in:

Arnd Bergmann 2011-12-27 22:19:50 +00:00

parent 0363e3dae1 f5ce5e7e9c

commit 70d84a6431

3 changed files with 13 additions and 35 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

26

arch/arm/mach-tegra/Makefile

View file

18

arch/arm/mach-tegra/include/mach/entry-macro.S

View file

4

arch/arm/mach-tegra/irq.c

View file