Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/ixgbe/ixgbe_main.c
	drivers/net/smc91x.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index 6a3f8fb0c9dd..3317148a4b93 100644
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -286,8 +286,8 @@ static void ulite_release_port(struct uart_port *port)
 
 static int ulite_request_port(struct uart_port *port)
 {
-        pr_debug("ulite console: port=%p; port->mapbase=%x\n",
-                 port, port->mapbase);
+        pr_debug("ulite console: port=%p; port->mapbase=%llx\n",
+                 port, (unsigned long long) port->mapbase);
 
         if (!request_mem_region(port->mapbase, ULITE_REGION, "uartlite")) {
                 dev_err(port->dev, "Memory region busy\n");