Merge branch 'imx-drivers' of git://git.pengutronix.de/git/imx/linux-2.6 into next/drivers

Browse source

* 'imx-drivers' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: imx_v4_v5_defconfig: Update defconfig
  ARM: mx27_3ds: Add camera support
  ARM: imx_v6_v7_defconfig: Add support for framebuffer and camera on mx31

...

This commit is contained in:

Arnd Bergmann 2012-02-27 13:42:09 +00:00

parent afde962608 15cc1b1c1e

commit dae2efd750

4 changed files with 157 additions and 0 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

16

arch/arm/configs/imx_v4_v5_defconfig

View file

32

arch/arm/configs/imx_v6_v7_defconfig

View file

1

arch/arm/mach-imx/Kconfig

View file

108

arch/arm/mach-imx/mach-mx27_3ds.c

View file