From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Mar 2011 00:28:10 +0000 (-0700)
Subject: Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v2.6.39-rc1~466
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c5811bf463b0ef82fabbd1708f8bb2d753aeb18;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6: (21 commits)
  tty: serial: altera_jtaguart: Add device tree support
  tty: serial: altera_uart: Add devicetree support
  dt: eliminate of_platform_driver shim code
  dt: Eliminate of_platform_{,un}register_driver
  dt/serial: Eliminate users of of_platform_{,un}register_driver
  dt/usb: Eliminate users of of_platform_{,un}register_driver
  dt/video: Eliminate users of of_platform_{,un}register_driver
  dt/net: Eliminate users of of_platform_{,un}register_driver
  dt/sound: Eliminate users of of_platform_{,un}register_driver
  dt/spi: Eliminate users of of_platform_{,un}register_driver
  dt: uartlite: merge platform and of_platform driver bindings
  dt: xilinx_hwicap: merge platform and of_platform driver bindings
  ipmi: convert OF driver to platform driver
  leds/leds-gpio: merge platform_driver with of_platform_driver
  dt/sparc: Eliminate users of of_platform_{,un}register_driver
  dt/powerpc: Eliminate users of of_platform_{,un}register_driver
  dt/powerpc: move of_bus_type infrastructure to ibmebus
  drivercore/dt: add a match table pointer to struct device
  dt: Typo fix.
  altera_ps2: Add devicetree support
  ...
---

4c5811bf463b0ef82fabbd1708f8bb2d753aeb18
diff --cc drivers/rtc/rtc-mpc5121.c
index b40c1ff,2b952c6..09ccd8d
--- a/drivers/rtc/rtc-mpc5121.c
+++ b/drivers/rtc/rtc-mpc5121.c
@@@ -246,10 -265,10 +246,9 @@@ static const struct rtc_class_ops mpc51
  	.read_alarm = mpc5121_rtc_read_alarm,
  	.set_alarm = mpc5121_rtc_set_alarm,
  	.alarm_irq_enable = mpc5121_rtc_alarm_irq_enable,
 -	.update_irq_enable = mpc5121_rtc_update_irq_enable,
  };
  
- static int __devinit mpc5121_rtc_probe(struct platform_device *op,
- 					const struct of_device_id *match)
+ static int __devinit mpc5121_rtc_probe(struct platform_device *op)
  {
  	struct mpc5121_rtc_data *rtc;
  	int err = 0;
diff --cc drivers/tty/serial/altera_uart.c
index 3a57352,1803c37..6d5b036
--- a/drivers/tty/serial/altera_uart.c
+++ b/drivers/tty/serial/altera_uart.c
@@@ -550,9 -583,9 +584,8 @@@ static int __devinit altera_uart_probe(
  	port->line = i;
  	port->type = PORT_ALTERA_UART;
  	port->iotype = SERIAL_IO_MEM;
- 	port->uartclk = platp->uartclk;
  	port->ops = &altera_uart_ops;
  	port->flags = UPF_BOOT_AUTOCONF;
 -	port->private_data = platp;
  
  	uart_add_one_port(&altera_uart_driver, port);