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

Commit 2b4f0175 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline

parents b857df1a 083c88fc

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -199,6 +199,10 @@ and is between 256 and 4096 characters. It is defined in the file 
			acpi_display_output=video

			See above.



	acpi_early_pdc_eval	[HW,ACPI] Evaluate processor _PDC methods

				early. Needed on some platforms to properly

				initialize the EC.



	acpi_irq_balance [HW,ACPI]

			ACPI will balance active IRQs

			default in APIC mode

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -616,10 +616,10 @@ M: Richard Purdie <rpurdie@rpsys.net> 
S:	Maintained



ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE

M:	Paulius Zaleckas <paulius.zaleckas@teltonika.lt>

M:	Paulius Zaleckas <paulius.zaleckas@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://gitorious.org/linux-gemini/mainline.git

S:	Maintained

S:	Odd Fixes

F:	arch/arm/mach-gemini/



ARM/EBSA110 MACHINE SUPPORT
@@ -641,9 +641,9 @@ T: topgit git://git.openezx.org/openezx.git 
F:	arch/arm/mach-pxa/ezx.c



ARM/FARADAY FA526 PORT

M:	Paulius Zaleckas <paulius.zaleckas@teltonika.lt>

M:	Paulius Zaleckas <paulius.zaleckas@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

S:	Odd Fixes

F:	arch/arm/mm/*-fa*



ARM/FOOTBRIDGE ARCHITECTURE

arch/arm/mach-gemini/gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int gpio_set_irq_type(unsigned int irq, unsigned int type) 
	unsigned int reg_both, reg_level, reg_type;



	reg_type = __raw_readl(base + GPIO_INT_TYPE);

	reg_level = __raw_readl(base + GPIO_INT_BOTH_EDGE);

	reg_level = __raw_readl(base + GPIO_INT_LEVEL);

	reg_both = __raw_readl(base + GPIO_INT_BOTH_EDGE);



	switch (type) {
@@ -117,7 +117,7 @@ static int gpio_set_irq_type(unsigned int irq, unsigned int type) 
	}



	__raw_writel(reg_type, base + GPIO_INT_TYPE);

	__raw_writel(reg_level, base + GPIO_INT_BOTH_EDGE);

	__raw_writel(reg_level, base + GPIO_INT_LEVEL);

	__raw_writel(reg_both, base + GPIO_INT_BOTH_EDGE);



	gpio_ack_irq(irq);

arch/ia64/include/asm/acpi.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ ia64_acpi_release_global_lock (unsigned int *lock) 
#define acpi_noirq 0	/* ACPI always enabled on IA64 */

#define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */

#define acpi_strict 1	/* no ACPI spec workarounds on IA64 */

#define acpi_ht 0	/* no HT-only mode on IA64 */

#endif

#define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */

static inline void disable_acpi(void) { }

arch/powerpc/platforms/85xx/mpc85xx_mds.c

+2 −1
Original line number Diff line number Diff line
@@ -338,7 +338,8 @@ static void __init mpc85xx_mds_pic_init(void) 
	}



	mpic = mpic_alloc(np, r.start,

			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,

			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |

			MPIC_BROKEN_FRR_NIRQS,

			0, 256, " OpenPIC  ");

	BUG_ON(mpic == NULL);

	of_node_put(np);