Merge branch 'v3.1-rc10' into for-3.2/core

Conflicts:
	block/blk-core.c
	include/linux/blkdev.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index af9b7814965a..b922f5d2e61e 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1609,9 +1609,11 @@ static struct console atmel_console = {
 static int __init atmel_console_init(void)
 {
         if (atmel_default_console_device) {
-                add_preferred_console(ATMEL_DEVICENAME,
-                                      atmel_default_console_device->id, NULL);
-                atmel_init_port(&atmel_ports[atmel_default_console_device->id],
+                struct atmel_uart_data *pdata =
+                        atmel_default_console_device->dev.platform_data;
+
+                add_preferred_console(ATMEL_DEVICENAME, pdata->num, NULL);
+                atmel_init_port(&atmel_ports[pdata->num],
                                 atmel_default_console_device);
                 register_console(&atmel_console);
         }