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

Commit d3c5f8b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] integrator: fix build warnings and errors
  [ARM] fix OMAP include loops
  Revert "[ARM] pxa: spitz wants PXA27x UDC definitions"
  [ARM] 5053/1: define before use of processor_id
  [ARM] 5052/1: export clock functions for the at91x40
  [ARM] 5051/1: define pgtable_t for the !CONFIG_MMU case too
  [ARM] omap: fix omap clk support build errors
  [ARM] 5039/1: S3C244X: Rename SDI device if running on S3C244X.
  [ARM] 5043/1: pxafb: remove unused mode variable in pxafb_init_fbinfo
  [ARM] 5041/1: VR1000: Fix DM9000 IRQ flags initialisation
  [ARM] 5040/1: BAST: Fix DM9000 IRQ flags initialisation
  [ARM] 5038/1: ARM: OMAP: Remove tsc2102 references from board-palmte.c
  [ARM] 5025/2: fix collie cpu initialisation
parents 25d5cb4b 7c28472a

arch/arm/mach-at91/at91x40.c

+17 −1
Original line number Diff line number Diff line
@@ -16,16 +16,32 @@ 
#include <asm/mach/arch.h>

#include <asm/arch/at91x40.h>

#include <asm/arch/at91_st.h>

#include <asm/arch/timex.h>

#include "generic.h"



/*

 * This is used in the gpio code, stub locally.

 * Export the clock functions for the AT91X40. Some external code common

 * to all AT91 family parts relys on this, like the gpio and serial support.

 */

int clk_enable(struct clk *clk)

{

	return 0;

}



void clk_disable(struct clk *clk)

{

}



unsigned long clk_get_rate(struct clk *clk)

{

	return AT91X40_MASTER_CLOCK;

}



struct clk *clk_get(struct device *dev, const char *id)

{

	return NULL;

}



void __init at91x40_initialize(unsigned long main_clock)

{

	at91_extern_irq = (1 << AT91X40_ID_IRQ0) | (1 << AT91X40_ID_IRQ1)

arch/arm/mach-integrator/impd1.c

+2 −1
Original line number Diff line number Diff line
@@ -369,7 +369,8 @@ static int impd1_probe(struct lm_device *dev) 


	lm_set_drvdata(dev, impd1);



	printk("IM-PD1 found at 0x%08lx\n", dev->resource.start);

	printk("IM-PD1 found at 0x%08lx\n",

		(unsigned long)dev->resource.start);



	for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++) {

		impd1->vcos[i].owner = THIS_MODULE,

arch/arm/mach-integrator/pci_v3.c

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,6 @@ v3_pci_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 
		addr, fsr, pc, instr, __raw_readl(SC_LBFADDR), __raw_readl(SC_LBFCODE) & 255,

		v3_readb(V3_LB_ISTAT));

	printk(KERN_DEBUG "%s", buf);

	printascii(buf);

#endif



	v3_writeb(V3_LB_ISTAT, 0);
@@ -447,6 +446,7 @@ static irqreturn_t v3_irq(int dummy, void *devid) 
	unsigned long pc = instruction_pointer(regs);

	unsigned long instr = *(unsigned long *)pc;

	char buf[128];

	extern void printascii(const char *);



	sprintf(buf, "V3 int %d: pc=0x%08lx [%08lx] LBFADDR=%08x LBFCODE=%02x "

		"ISTAT=%02x\n", IRQ_AP_V3INT, pc, instr,

arch/arm/mach-omap1/board-palmte.c

+0 −10
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/spi/spi.h>

#include <linux/spi/tsc2102.h>

#include <linux/interrupt.h>

#include <linux/apm-emulation.h>
@@ -315,14 +314,6 @@ static void palmte_get_power_status(struct apm_power_info *info, int *battery) 
#define palmte_get_power_status	NULL

#endif



static struct tsc2102_config palmte_tsc2102_config = {

	.use_internal	= 0,

	.monitor	= TSC_BAT1 | TSC_AUX | TSC_TEMP,

	.temp_at25c	= { 2200, 2615 },

	.apm_report	= palmte_get_power_status,

	.alsa_config	= &palmte_alsa_config,

};



static struct omap_board_config_kernel palmte_config[] __initdata = {

	{ OMAP_TAG_USB,		&palmte_usb_config },

	{ OMAP_TAG_MMC,		&palmte_mmc_config },
@@ -336,7 +327,6 @@ static struct spi_board_info palmte_spi_info[] __initdata = { 
		.bus_num	= 2,	/* uWire (officially) */

		.chip_select	= 0,	/* As opposed to 3 */

		.irq		= OMAP_GPIO_IRQ(PALMTE_PINTDAV_GPIO),

		.platform_data	= &palmte_tsc2102_config,

		.max_speed_hz	= 8000000,

	},

};

arch/arm/mach-pxa/spitz.c

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa2xx-regs.h>

#include <asm/arch/pxa2xx-gpio.h>

#include <asm/arch/pxa27x-udc.h>

#include <asm/arch/irda.h>

#include <asm/arch/mmc.h>

#include <asm/arch/ohci.h>