Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6800e4c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'omap-fixes-for-linus' of... 

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  arm: omap1: devices: need to return with a value
  OMAP1: camera.h: add missing include
  omap: dma: Add read-back to DMA interrupt handler to avoid spuriousinterrupts
  OMAP2: Devkit8000: Fix mmc regulator failure
parents 477d4e4f dfcccd3a

arch/arm/mach-omap1/devices.c

+2 −3
Original line number Diff line number Diff line
@@ -321,10 +321,9 @@ static struct platform_device omap_wdt_device = { 
static int __init omap_init_wdt(void)

{

	if (!cpu_is_omap16xx())

		return;

		return -ENODEV;



	platform_device_register(&omap_wdt_device);

	return 0;

	return platform_device_register(&omap_wdt_device);

}

subsys_initcall(omap_init_wdt);

#endif

arch/arm/mach-omap1/include/mach/camera.h

+2 −0
Original line number Diff line number Diff line 
#ifndef __ASM_ARCH_CAMERA_H_

#define __ASM_ARCH_CAMERA_H_



#include <media/omap1_camera.h>



void omap1_camera_init(void *);



static inline void omap1_set_camera_info(struct omap1_cam_platform_data *info)

arch/arm/mach-omap2/board-devkit8000.c

+0 −3
Original line number Diff line number Diff line
@@ -242,9 +242,6 @@ static int devkit8000_twl_gpio_setup(struct device *dev, 
	mmc[0].gpio_cd = gpio + 0;

	omap2_hsmmc_init(mmc);



	/* link regulators to MMC adapters */

	devkit8000_vmmc1_supply.dev = mmc[0].dev;



	/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */

	gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;

arch/arm/plat-omap/dma.c

+2 −0
Original line number Diff line number Diff line
@@ -1983,6 +1983,8 @@ static int omap2_dma_handle_ch(int ch) 


	dma_write(OMAP2_DMA_CSR_CLEAR_MASK, CSR(ch));

	dma_write(1 << ch, IRQSTATUS_L0);

	/* read back the register to flush the write */

	dma_read(IRQSTATUS_L0);



	/* If the ch is not chained then chain_id will be -1 */

	if (dma_chan[ch].chain_id != -1) {