Commit 15895b93 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5131/1: Annotate platform_secondary_init with trace_hardirqs_off
  [ARM] 5117/1: pxafb: fix __devinit/exit annotations
  [ARM] Export dma_sync_sg_for_device()
  [ARM] 5109/1: Mark rtc sa1100 driver as wakeup source before registering it
  [ARM] 5116/1: pxafb: cleanup and fix order of failure handling
  [ARM] 5115/1: pxafb: fix ifdef for command line option handling
  ARM: OMAP: Correcting the gpmc prefetch control register address
  ARM: OMAP: DMA: Don't mark channel active in omap_enable_channel_irq
parents 3e2a078c 08383ef2

arch/arm/common/dmabounce.c

+2 −1
Original line number Diff line number Diff line
@@ -650,7 +650,8 @@ EXPORT_SYMBOL(dma_map_sg); 
EXPORT_SYMBOL(dma_unmap_sg);

EXPORT_SYMBOL(dma_sync_single_for_cpu);

EXPORT_SYMBOL(dma_sync_single_for_device);

EXPORT_SYMBOL(dma_sync_sg);

EXPORT_SYMBOL(dma_sync_sg_for_cpu);

EXPORT_SYMBOL(dma_sync_sg_for_device);

EXPORT_SYMBOL(dmabounce_register_dev);

EXPORT_SYMBOL(dmabounce_unregister_dev);

arch/arm/mach-omap2/gpmc.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#define GPMC_STATUS		0x54

#define GPMC_PREFETCH_CONFIG1	0x1e0

#define GPMC_PREFETCH_CONFIG2	0x1e4

#define GPMC_PREFETCH_CONTROL	0x1e8

#define GPMC_PREFETCH_CONTROL	0x1ec

#define GPMC_PREFETCH_STATUS	0x1f0

#define GPMC_ECC_CONFIG		0x1f4

#define GPMC_ECC_CONTROL	0x1f8

arch/arm/mach-realview/platsmp.c

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ static DEFINE_SPINLOCK(boot_lock); 


void __cpuinit platform_secondary_init(unsigned int cpu)

{

	trace_hardirqs_off();



	/*

	 * the primary core may have used a "cross call" soft interrupt

	 * to get this processor out of WFI in the BootMonitor - make

arch/arm/plat-omap/dma.c

+0 −2
Original line number Diff line number Diff line
@@ -501,8 +501,6 @@ static inline void omap_enable_channel_irq(int lch) 


	/* Enable some nice interrupts. */

	OMAP_DMA_CICR_REG(lch) = dma_chan[lch].enabled_irqs;



	dma_chan[lch].flags |= OMAP_DMA_ACTIVE;

}



static void omap_disable_channel_irq(int lch)

drivers/rtc/rtc-sa1100.c

+2 −2
Original line number Diff line number Diff line
@@ -331,14 +331,14 @@ static int sa1100_rtc_probe(struct platform_device *pdev) 
		RCNR = 0;

	}



	device_init_wakeup(&pdev->dev, 1);



	rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops,

				THIS_MODULE);



	if (IS_ERR(rtc))

		return PTR_ERR(rtc);



	device_init_wakeup(&pdev->dev, 1);



	platform_set_drvdata(pdev, rtc);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE