Update DaVinci defconfig, no functional change.
Signed-off-by: Dirk Behme <dirk.behme@gmail.com>

Change EXTRAVERSION name from omap to davinci.
Signed-off-by: Dirk Behme <dirk.behme@gmail.com>

Fix warning

arch/arm/mach-davinci/time.c:374:2: warning: no newline at end of file
Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Signed-off-by: Kevin Hilman <khilman@mvista.com>

Fix broken compilation of drivers/ide/davinci/palm_bk3710.c
Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Signed-off-by: Kevin Hilman <khilman@mvista.com>

Fix build for 2430 as suggested by Richard Woodruff.
Signed-off-by: Tony Lindgren <tony@atomide.com>

Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Straight forward port of the VPFE driver from the 2.6.10 kernel,
including some previous work done by Alex Rier. There are a few things
which need cleanup before going upstream.

1) video-buf layer support for contiguous buffers
2) potential reuse of tvp5150 instead of tvp5146

For (2), if anyone is looking for a concrete way to contribute to the
open-source kernel, they could tackle it.  I haven't looked at the
datasheets in detail, but at first glance, I think we could probably
use the existing tvp5150 driver for the tvp5146 instead of adding a
new driver as the current.  The tvp5150 driver may need some minor
adjustments, but that is preferrable than having an entirely different
driver.
Signed-off-by: Kevin Hilman <khilman@mvista.com>

Signed-off-by: Vladimir A. Barinov <vbarinov@ru.mvista.com>
Signed-off-by: Kevin Hilman <khilman@mvista.com>

Conflicts:

	arch/arm/Kconfig
	arch/arm/Makefile
	arch/arm/mach-davinci/Kconfig
	arch/arm/mach-davinci/Makefile
	arch/arm/mach-davinci/board-evm.c
	arch/arm/mach-davinci/clock.c
	arch/arm/mach-davinci/clock.h
	arch/arm/mach-davinci/gpio.c
	arch/arm/mach-davinci/id.c
	arch/arm/mach-davinci/io.c
	arch/arm/mach-davinci/irq.c
	arch/arm/mach-davinci/serial.c
	arch/arm/mach-davinci/time.c
	arch/arm/mm/Kconfig
	drivers/i2c/busses/Kconfig
	drivers/i2c/chips/Kconfig
	drivers/ide/ide-proc.c
	drivers/net/Kconfig
	drivers/rtc/Makefile
	drivers/usb/musb/plat_uds.c
	include/asm-arm/arch-davinci/common.h
	include/asm-arm/arch-davinci/debug-macro.S
	include/asm-arm/arch-davinci/dma.h
	include/asm-arm/arch-davinci/entry-macro.S
	include/asm-arm/arch-davinci/gpio.h
	include/asm-arm/arch-davinci/hardware.h
	include/asm-arm/arch-davinci/io.h
	include/asm-arm/arch-davinci/irqs.h
	include/asm-arm/arch-davinci/memory.h
	include/asm-arm/arch-davinci/system.h
	include/asm-arm/arch-davinci/timex.h
	include/asm-arm/arch-davinci/uncompress.h
	include/asm-arm/arch-davinci/vmalloc.h

Search and replace MGC_DMA with MUSB_DMA
Signed-off-by: Tony Lindgren <tony@atomide.com>

Get rid of unnecessary DMA typedef & fix a comment typo
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bComplete with complete
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bMore with more
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bReg with reg
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace wType with musb_type
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace pController with controller
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace dwData with data
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace wRelMinor with rev_minor
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace wRelMajor with rev_major
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace wRelease with hwvers
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace wFrame with frame
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace nEnd with epnum
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace nBestEnd with best_end
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace wBestDiff with best_diff
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace wVal with val, except for wValue
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bIsochError with iso_err
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace pFifoSource with fifo_src
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace pFifoDest with fifo_dest
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bDmaOk with dma_ok
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace wLoadCount with load_count
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace nPipe with pipe
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bDone with done
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace wRxCount with rx_count
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace pDmaChannel with dma_channel
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace wEndMask with epmask
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace dwLength with len
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace pBuffer with buf
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace pUrb with urb
Signed-off-by: Tony Lindgren <tony@atomide.com>

Search and replace bTransmit with transmit
Signed-off-by: Tony Lindgren <tony@atomide.com>