From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 28 Mar 2009 20:29:51 +0000 (+0000)
Subject: Merge branch 'origin' into devel
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ed40d0c472b136682b2fcba05f89762859c7374f;p=linux-2.6-omap-h63xx.git

Merge branch 'origin' into devel

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c
---

ed40d0c472b136682b2fcba05f89762859c7374f
diff --cc Documentation/kernel-parameters.txt
index ef9827f7c84,fa4e1239a8f..6dda1cc3fba
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -829,13 -832,10 +832,16 @@@ and is between 256 and 4096 characters
  
  	hvc_iucv=	[S390] Number of z/VM IUCV hypervisor console (HVC)
  			       terminal devices. Valid values: 0..8
+ 	hvc_iucv_allow=	[S390] Comma-separated list of z/VM user IDs.
+ 			       If specified, z/VM IUCV HVC accepts connections
+ 			       from listed z/VM user IDs only.
  
 +	i2c_bus=	[HW] Override the default board specific I2C bus speed
 +			     or register an additional I2C bus that is not
 +			     registered from board initialization code.
 +			     Format:
 +			     <bus_id>,<clkrate>
 +
  	i8042.debug	[HW] Toggle i8042 debug mode
  	i8042.direct	[HW] Put keyboard port into non-translated mode
  	i8042.dumbkbd	[HW] Pretend that controller can only read data from
diff --cc arch/arm/mach-kirkwood/rd88f6281-setup.c
index c3deea5e3ca,e1c0516c4df..31e996d65fc
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@@ -114,15 -110,15 +119,15 @@@ static void __init rd88f6281_init(void
  	kirkwood_ge00_init(&rd88f6281_ge00_data);
  	kirkwood_pcie_id(&dev, &rev);
  	if (rev == MV88F6281_REV_A0) {
- 		rd88f6281_switch_data.sw_addr = 10;
+ 		rd88f6281_switch_chip_data.sw_addr = 10;
  		kirkwood_ge01_init(&rd88f6281_ge01_data);
  	} else {
- 		rd88f6281_switch_data.port_names[4] = "wan";
+ 		rd88f6281_switch_chip_data.port_names[4] = "wan";
  	}
- 	kirkwood_ge00_switch_init(&rd88f6281_switch_data, NO_IRQ);
+ 	kirkwood_ge00_switch_init(&rd88f6281_switch_plat_data, NO_IRQ);
  
 -	kirkwood_rtc_init();
  	kirkwood_sata_init(&rd88f6281_sata_data);
 +	kirkwood_sdio_init(&rd88f6281_mvsdio_data);
  	kirkwood_uart0_init();
  
  	platform_device_register(&rd88f6281_nand_flash);
diff --cc sound/soc/pxa/pxa2xx-i2s.c
index 223de890259,e6c24408c5f..2f4b6e489b7
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@@ -24,8 -24,7 +24,7 @@@
  #include <sound/pxa2xx-lib.h>
  
  #include <mach/hardware.h>
 -#include <mach/pxa-regs.h>
 +#include <mach/dma.h>
- #include <mach/pxa2xx-gpio.h>
  #include <mach/audio.h>
  
  #include "pxa2xx-pcm.h"