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

Commit 1a56f54c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents d1ffa566 2c4c6b27

arch/arm/configs/at91rm9200dk_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_CO285 is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_CAMELOT is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_IOP3XX is not set

arch/arm/configs/at91rm9200ek_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_CO285 is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_CAMELOT is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_IOP3XX is not set

arch/arm/configs/csb337_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_CO285 is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_CAMELOT is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_IOP3XX is not set

arch/arm/configs/csb637_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_CO285 is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_CAMELOT is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_IOP3XX is not set

arch/arm/mach-pxa/pxa27x.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ unsigned int get_clk_frequency_khz( int info) 


	/* Read clkcfg register: it has turbo, b, half-turbo (and f) */

	asm( "mrc\tp14, 0, %0, c6, c0, 0" : "=r" (clkcfg) );

	t  = clkcfg & (1 << 1);

	t  = clkcfg & (1 << 0);

	ht = clkcfg & (1 << 2);

	b  = clkcfg & (1 << 3);