Commit 1dd465ca authored Sep 30, 2005 by Linus Torvalds

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

parents a2218cac 217874fe

arch/arm/common/gic.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ static void gic_unmask_irq(unsigned int irq)
		writel(mask, gic_dist_base + GIC_DIST_ENABLE_SET + (irq / 32) * 4);
		}

		#ifdef CONFIG_SMP
		static void gic_set_cpu(struct irqdesc *desc, unsigned int irq, unsigned int cpu)
		{
		void __iomem *reg = gic_dist_base + GIC_DIST_TARGET + (irq & ~3);
		@@ -78,6 +79,7 @@ static void gic_set_cpu(struct irqdesc *desc, unsigned int irq, unsigned int cpu
		val \|= 1 << (cpu + shift);
		writel(val, reg);
		}
		#endif

		static struct irqchip gic_chip = {
		.ack = gic_ack_irq,

arch/arm/common/locomo.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@
		#include <linux/spinlock.h>

		#include <asm/hardware.h>
		#include <asm/mach-types.h>
		#include <asm/io.h>
		#include <asm/irq.h>
		#include <asm/mach/irq.h>

arch/arm/mach-imx/leds-mx1ads.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		#include <asm/system.h>
		#include <asm/io.h>
		#include <asm/leds.h>
		#include <asm/mach-types.h>
		#include "leds.h"

		/*

arch/arm/mach-iop3xx/common.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ unsigned long iop3xx_pcibios_min_mem = 0;
		/*
		* Default power-off for EP80219
		*/
		#include <asm/mach-types.h>

		static inline void ep80219_send_to_pic(__u8 c) {
		}

arch/arm/mach-iop3xx/iop321-time.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@
		#include <asm/io.h>
		#include <asm/irq.h>
		#include <asm/uaccess.h>
		#include <asm/mach-types.h>
		#include <asm/mach/irq.h>
		#include <asm/mach/time.h>