---

yaml
---
r: 68615
b: refs/heads/master
c: 6993bea
h: refs/heads/master
i:
  68613: 5ff945f
  68611: d09ecfd
  68607: 55b50b9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dd80d5d096f58b7a83ae493a20bfc9d0de30226
+refs/heads/master: 6993bea1b6ff49312f19339b3469db5887dfd633

trunk/arch/powerpc/platforms/52xx/lite5200.c

@@ -158,6 +158,18 @@ static void __init lite5200_setup_arch(void)
 		of_node_put(np);
 	}
 #endif
+
+#ifdef CONFIG_BLK_DEV_INITRD
+	if (initrd_start)
+		ROOT_DEV = Root_RAM0;
+	else
+#endif
+#ifdef  CONFIG_ROOT_NFS
+		ROOT_DEV = Root_NFS;
+#else
+		ROOT_DEV = Root_HDA1;
+#endif
+
 }
 
 /*

trunk/drivers/ata/pata_mpc52xx.c

@@ -308,6 +308,7 @@ mpc52xx_ata_init_one(struct device *dev, struct mpc52xx_ata_priv *priv,
 	struct ata_host *host;
 	struct ata_port *ap;
 	struct ata_ioports *aio;
+	int rc;
 
 	host = ata_host_alloc(dev, 1);
 	if (!host)

trunk/drivers/base/memory.c

@@ -34,7 +34,7 @@ static const char *memory_uevent_name(struct kset *kset, struct kobject *kobj)
 	return MEMORY_CLASS_NAME;
 }
 
-static int memory_uevent(struct kset *kset, struct kobject *obj, struct kobj_uevent_env *env)
+static int memory_uevent(struct kset *kset, struct kobj_uevent_env *env)
 {
 	int retval = 0;
 

trunk/drivers/mmc/core/sdio_bus.c

@@ -96,23 +96,30 @@ static int sdio_bus_match(struct device *dev, struct device_driver *drv)
 }
 
 static int
-sdio_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
+sdio_bus_uevent(struct device *dev, char **envp, int num_envp, char *buf,
+		int buf_size)
 {
 	struct sdio_func *func = dev_to_sdio_func(dev);
+	int i = 0, length = 0;
 
-	if (add_uevent_var(env,
+	if (add_uevent_var(envp, num_envp, &i,
+			buf, buf_size, &length,
 			"SDIO_CLASS=%02X", func->class))
 		return -ENOMEM;
 
-	if (add_uevent_var(env, 
+	if (add_uevent_var(envp, num_envp, &i,
+			buf, buf_size, &length,
 			"SDIO_ID=%04X:%04X", func->vendor, func->device))
 		return -ENOMEM;
 
-	if (add_uevent_var(env,
+	if (add_uevent_var(envp, num_envp, &i,
+			buf, buf_size, &length,
 			"MODALIAS=sdio:c%02Xv%04Xd%04X",
 			func->class, func->vendor, func->device))
 		return -ENOMEM;
 
+	envp[i] = NULL;
+
 	return 0;
 }
 

trunk/drivers/net/ibm_newemac/rgmii.c

@@ -251,7 +251,7 @@ static int __devinit rgmii_probe(struct of_device *ofdev,
 	}
 
 	/* Check for RGMII type */
-	if (of_device_is_compatible(ofdev->node, "ibm,rgmii-axon"))
+	if (device_is_compatible(ofdev->node, "ibm,rgmii-axon"))
 		dev->type = RGMII_AXON;
 	else
 		dev->type = RGMII_STANDARD;

trunk/drivers/serial/mpc52xx_uart.c

@@ -756,8 +756,8 @@ mpc52xx_console_setup(struct console *co, char *options)
 	if (port->membase == NULL)
 		return -EINVAL;
 
-	pr_debug("mpc52xx-psc uart at %p, mapped to %p, irq=%x, freq=%i\n",
-	         (void*)port->mapbase, port->membase, port->irq, port->uartclk);
+	pr_debug("mpc52xx-psc uart at %lx, mapped to %p, irq=%x, freq=%i\n",
+	         port->mapbase, port->membase, port->irq, port->uartclk);
 
 	/* Setup the port parameters accoding to options */
 	if (options)
@@ -974,8 +974,8 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
 	port->mapbase = res.start;
 	port->irq = irq_of_parse_and_map(op->node, 0);
 
-	dev_dbg(&op->dev, "mpc52xx-psc uart at %p, irq=%x, freq=%i\n",
-	        (void*)port->mapbase, port->irq, port->uartclk);
+	dev_dbg(&op->dev, "mpc52xx-psc uart at %lx, irq=%x, freq=%i\n",
+	        port->mapbase, port->irq, port->uartclk);
 
 	if ((port->irq==NO_IRQ) || !port->mapbase) {
 		printk(KERN_ERR "Could not allocate resources for PSC\n");

trunk/drivers/ssb/main.c

@@ -321,17 +321,23 @@ static int ssb_bus_match(struct device *dev, struct device_driver *drv)
 	return 0;
 }
 
-static int ssb_device_uevent(struct device *dev, struct kobj_uevent_env *env)
+static int ssb_device_uevent(struct device *dev, char **envp, int num_envp,
+			     char *buffer, int buffer_size)
 {
 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
+	int ret, i = 0, length = 0;
 
 	if (!dev)
 		return -ENODEV;
 
-	return add_uevent_var(env,
+	ret = add_uevent_var(envp, num_envp, &i,
+			     buffer, buffer_size, &length,
 			     "MODALIAS=ssb:v%04Xid%04Xrev%02X",
 			     ssb_dev->id.vendor, ssb_dev->id.coreid,
 			     ssb_dev->id.revision);
+	envp[i] = NULL;
+
+	return ret;
 }
 
 static struct bus_type ssb_bustype = {

trunk/drivers/ssb/pcmcia.c

@@ -10,7 +10,6 @@
 
 #include <linux/ssb/ssb.h>
 #include <linux/delay.h>
-#include <linux/io.h>
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>

trunk/drivers/usb/host/ohci-ssb.c

@@ -117,10 +117,8 @@ static const struct hc_driver ssb_ohci_hc_driver = {
 	.hub_status_data	= ohci_hub_status_data,
 	.hub_control		= ohci_hub_control,
 	.hub_irq_enable		= ohci_rhsc_enable,
-#ifdef	CONFIG_PM
 	.bus_suspend		= ohci_bus_suspend,
 	.bus_resume		= ohci_bus_resume,
-#endif
 
 	.start_port_reset	= ohci_start_port_reset,
 };