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

Commit db9ca580 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream

parents bf717b11 eb35cf60

arch/alpha/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ config ALPHA_IRONGATE 


config GENERIC_HWEIGHT

	bool

	default y if !ALPHA_EV6 && !ALPHA_EV67

	default y if !ALPHA_EV67



config ALPHA_AVANTI

	bool

arch/arm/mach-imx/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static void 
imx_gpio_ack_irq(unsigned int irq)

{

	DEBUG_IRQ("%s: irq %d\n", __FUNCTION__, irq);

	ISR(IRQ_TO_REG(irq)) |= 1 << ((irq - IRQ_GPIOA(0)) % 32);

	ISR(IRQ_TO_REG(irq)) = 1 << ((irq - IRQ_GPIOA(0)) % 32);

}



static void

arch/arm/mach-integrator/integrator_cp.c

+1 −4
Original line number Diff line number Diff line
@@ -232,8 +232,6 @@ static void __init intcp_init_irq(void) 
	for (i = IRQ_PIC_START; i <= IRQ_PIC_END; i++) {

		if (i == 11)

			i = 22;

		if (i == IRQ_CP_CPPLDINT)

			i++;

		if (i == 29)

			break;

		set_irq_chip(i, &pic_chip);
@@ -259,8 +257,7 @@ static void __init intcp_init_irq(void) 
		set_irq_flags(i, IRQF_VALID | IRQF_PROBE);

	}



	set_irq_handler(IRQ_CP_CPPLDINT, sic_handle_irq);

	pic_unmask_irq(IRQ_CP_CPPLDINT);

	set_irq_chained_handler(IRQ_CP_CPPLDINT, sic_handle_irq);

}



/*

arch/arm/mach-pxa/spitz.c

+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ static int spitz_ohci_init(struct device *dev) 
static struct pxaohci_platform_data spitz_ohci_platform_data = {

	.port_mode	= PMM_NPS_MODE,

	.init		= spitz_ohci_init,

	.power_budget	= 150,

};

arch/arm/mach-sa1100/neponset.c

+8 −0
Original line number Diff line number Diff line
@@ -59,6 +59,14 @@ neponset_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg 
		if (irr & (IRR_ETHERNET | IRR_USAR)) {

			desc->chip->mask(irq);



			/*

			 * Ack the interrupt now to prevent re-entering

			 * this neponset handler.  Again, this is safe

			 * since we'll check the IRR register prior to

			 * leaving.

			 */

			desc->chip->ack(irq);



			if (irr & IRR_ETHERNET) {

				d = irq_desc + IRQ_NEPONSET_SMC9196;

				desc_handle_irq(IRQ_NEPONSET_SMC9196, d, regs);