Commit 1398ab7c 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] 3743/1: ARM: OMAP: Fix compile for OMAP
  [ARM] 3739/1: genirq updates:  irq_chip, add and use irq_chip.name
parents a166222c e252630f

arch/arm/common/gic.c

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ static void gic_set_cpu(unsigned int irq, cpumask_t mask_val) 
}

#endif



static struct irqchip gic_chip = {

static struct irq_chip gic_chip = {

	.name		= "GIC",

	.ack		= gic_ack_irq,

	.mask		= gic_mask_irq,

	.unmask		= gic_unmask_irq,

arch/arm/common/locomo.c

+10 −5
Original line number Diff line number Diff line
@@ -204,7 +204,8 @@ static void locomo_unmask_irq(unsigned int irq) 
	locomo_writel(r, mapbase + LOCOMO_ICR);

}



static struct irqchip locomo_chip = {

static struct irq_chip locomo_chip = {

	.name	= "LOCOMO",

	.ack	= locomo_ack_irq,

	.mask	= locomo_mask_irq,

	.unmask	= locomo_unmask_irq,
@@ -249,7 +250,8 @@ static void locomo_key_unmask_irq(unsigned int irq) 
	locomo_writel(r, mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);

}



static struct irqchip locomo_key_chip = {

static struct irq_chip locomo_key_chip = {

	.name	= "LOCOMO-key",

	.ack	= locomo_key_ack_irq,

	.mask	= locomo_key_mask_irq,

	.unmask	= locomo_key_unmask_irq,
@@ -312,7 +314,8 @@ static void locomo_gpio_unmask_irq(unsigned int irq) 
	locomo_writel(r, mapbase + LOCOMO_GIE);

}



static struct irqchip locomo_gpio_chip = {

static struct irq_chip locomo_gpio_chip = {

	.name	= "LOCOMO-gpio",

	.ack	= locomo_gpio_ack_irq,

	.mask	= locomo_gpio_mask_irq,

	.unmask	= locomo_gpio_unmask_irq,
@@ -357,7 +360,8 @@ static void locomo_lt_unmask_irq(unsigned int irq) 
	locomo_writel(r, mapbase + LOCOMO_LTINT);

}



static struct irqchip locomo_lt_chip = {

static struct irq_chip locomo_lt_chip = {

	.name	= "LOCOMO-lt",

	.ack	= locomo_lt_ack_irq,

	.mask	= locomo_lt_mask_irq,

	.unmask	= locomo_lt_unmask_irq,
@@ -418,7 +422,8 @@ static void locomo_spi_unmask_irq(unsigned int irq) 
	locomo_writel(r, mapbase + LOCOMO_SPIIE);

}



static struct irqchip locomo_spi_chip = {

static struct irq_chip locomo_spi_chip = {

	.name	= "LOCOMO-spi",

	.ack	= locomo_spi_ack_irq,

	.mask	= locomo_spi_mask_irq,

	.unmask	= locomo_spi_unmask_irq,

arch/arm/common/sa1111.c

+4 −2
Original line number Diff line number Diff line
@@ -272,7 +272,8 @@ static int sa1111_wake_lowirq(unsigned int irq, unsigned int on) 
	return 0;

}



static struct irqchip sa1111_low_chip = {

static struct irq_chip sa1111_low_chip = {

	.name		= "SA1111-l",

	.ack		= sa1111_ack_irq,

	.mask		= sa1111_mask_lowirq,

	.unmask		= sa1111_unmask_lowirq,
@@ -368,7 +369,8 @@ static int sa1111_wake_highirq(unsigned int irq, unsigned int on) 
	return 0;

}



static struct irqchip sa1111_high_chip = {

static struct irq_chip sa1111_high_chip = {

	.name		= "SA1111-h",

	.ack		= sa1111_ack_irq,

	.mask		= sa1111_mask_highirq,

	.unmask		= sa1111_unmask_highirq,

arch/arm/common/vic.c

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ static void vic_unmask_irq(unsigned int irq) 
	writel(1 << irq, base + VIC_INT_ENABLE);

}



static struct irqchip vic_chip = {

static struct irq_chip vic_chip = {

	.name	= "VIC",

	.ack	= vic_mask_irq,

	.mask	= vic_mask_irq,

	.unmask	= vic_unmask_irq,

arch/arm/kernel/ecard.c

+2 −1
Original line number Diff line number Diff line
@@ -470,7 +470,8 @@ static void ecard_irq_mask(unsigned int irqnr) 
	}

}



static struct irqchip ecard_chip = {

static struct irq_chip ecard_chip = {

	.name	= "ECARD",

	.ack	= ecard_irq_mask,

	.mask	= ecard_irq_mask,

	.unmask = ecard_irq_unmask,