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

Commit 6aa033d7 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: 6265/1: kirkwood: move qnap_tsx1x_register_flash() to .init.text
  ARM: 6263/1: ns9xxx: fix FTBFS for zImage
  ARM: 6262/1: arm/clps711x: fix debug macro compilation failure
  ARM: 6261/1: arm/shark: fix debug macro compilation failure
  ARM: 6260/1: arm/plat-spear: fix debug macro compilation failure
  ARM: 6259/1: arm/ns9xxx: fix debug macro compilation failure
  ARM: 6258/1: arm/h720x: fix debug macro compilation failure
  ARM: 6233/1: Delete a wrong redundant right parenthesis
  ARM: 6230/1: fix nuc900 touchscreen clk definition bug
  [ARM] pxa: fix incorrect CONFIG_CPU_PXA27x to CONFIG_PXA27x
  [ARM] pxa/colibri-pxa300: fix AC97 init
  [ARM] pxa: fix incorrect order of AC97 reset pin configs
  [ARM] pxa: fix frequency scaling for pcmcia/pxa2xx_base
  [ARM] pxa: cpufreq-pxa2xx: fix DRI recomputation routine
  [ARM] pxa/corgi: fix MMC/SD card detection failure
parents 58b164b5 f9578fc0

arch/arm/mach-clps711x/include/mach/debug-macro.S

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 *

*/



#include <mach/hardware.h>

#include <asm/hardware/clps7111.h>



		.macro	addruart, rx, tmp

arch/arm/mach-footbridge/common.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ EXPORT_SYMBOL(__bus_to_virt); 


unsigned long __pfn_to_bus(unsigned long pfn)

{

	return __pfn_to_phys(pfn) + (fb_bus_sdram_offset() - PHYS_OFFSET));

	return __pfn_to_phys(pfn) + (fb_bus_sdram_offset() - PHYS_OFFSET);

}

EXPORT_SYMBOL(__pfn_to_bus);

arch/arm/mach-h720x/include/mach/debug-macro.S

+4 −2
Original line number Diff line number Diff line
@@ -11,8 +11,10 @@ 
 *

*/



		.equ    io_virt, IO_BASE

		.equ    io_phys, IO_START

#include <mach/hardware.h>



		.equ    io_virt, IO_VIRT

		.equ    io_phys, IO_PHYS



		.macro  addruart, rx, tmp

		mrc     p15, 0, \rx, c1, c0

arch/arm/mach-kirkwood/tsx1x-common.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ struct spi_board_info __initdata qnap_tsx1x_spi_slave_info[] = { 
	},

};



void qnap_tsx1x_register_flash(void)

void __init qnap_tsx1x_register_flash(void)

{

	spi_register_board_info(qnap_tsx1x_spi_slave_info,

				ARRAY_SIZE(qnap_tsx1x_spi_slave_info));

arch/arm/mach-kirkwood/tsx1x-common.h

+1 −1
Original line number Diff line number Diff line 
#ifndef __ARCH_KIRKWOOD_TSX1X_COMMON_H

#define __ARCH_KIRKWOOD_TSX1X_COMMON_H



extern void qnap_tsx1x_register_flash(void);

extern void __init qnap_tsx1x_register_flash(void);

extern void qnap_tsx1x_power_off(void);



#endif