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

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

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents b67c26e4 11849fe6

arch/arm/configs/spitz_defconfig

+18 −1
Original line number Diff line number Diff line
@@ -897,7 +897,24 @@ CONFIG_UNIX98_PTYS=y 
#

# I2C support

#

# CONFIG_I2C is not set

CONFIG_I2C=y

# CONFIG_I2C_CHARDEV is not set



#

# I2C Algorithms

#

# CONFIG_I2C_ALGOBIT is not set

# CONFIG_I2C_ALGOPCF is not set

# CONFIG_I2C_ALGOPCA is not set



#

# I2C Hardware Bus support

#

CONFIG_I2C_PXA=y

# CONFIG_I2C_PXA_SLAVE is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_STUB is not set

# CONFIG_I2C_PCA_ISA is not set



#

# Hardware Monitoring support

arch/arm/mach-ixp4xx/ixdp425-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { 
	{

		.mapbase	= IXP4XX_UART2_BASE_PHYS,

		.membase	= (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,

		.irq		= IRQ_IXP4XX_UART1,

		.irq		= IRQ_IXP4XX_UART2,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

arch/arm/mach-pxa/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ config MACH_AKITA 
	depends PXA_SHARPSL_27x

	select PXA_SHARP_Cxx00

	select MACH_SPITZ

	select I2C

	select I2C_PXA



config MACH_SPITZ

	bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"

arch/arm/mm/flush.c

+6 −1
Original line number Diff line number Diff line
@@ -155,14 +155,19 @@ static void __flush_dcache_aliases(struct address_space *mapping, struct page *p 
 *  space mappings, we can be lazy and remember that we may have dirty

 *  kernel cache lines for later.  Otherwise, we assume we have

 *  aliasing mappings.

 *

 * Note that we disable the lazy flush for SMP.

 */

void flush_dcache_page(struct page *page)

{

	struct address_space *mapping = page_mapping(page);



#ifndef CONFIG_SMP

	if (mapping && !mapping_mapped(mapping))

		set_bit(PG_dcache_dirty, &page->flags);

	else {

	else

#endif

	{

		__flush_dcache_page(mapping, page);

		if (mapping && cache_is_vivt())

			__flush_dcache_aliases(mapping, page);

include/asm-arm/semaphore.h

+0 −5
Original line number Diff line number Diff line
@@ -47,11 +47,6 @@ static inline void init_MUTEX_LOCKED(struct semaphore *sem) 
	sema_init(sem, 0);

}



static inline int sema_count(struct semaphore *sem)

{

	return atomic_read(&sem->count);

}



/*

 * special register calling convention

 */