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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (23 commits)
  [SPARC64]: virt_to_real_irq_table --> virt_irq_table
  [SPARC64]: virt_irq --> bucket mapping no longer necessary
  [SPARC64]: Kill ugly __bucket() macro.
  [SPARC64]: Kill ugly __irq_ino() macro.
  [SPARC64]: Only use bypass accesses to INO buckets.
  [SPARC64]: Update defconfig.
  [SPARC64]: Use sun4v VIRQ interfaces as intended.
  [SPARC64]: Allocate ivector_table dynamically.
  [SPARC64]: Access ivector_table[] using physical addresses.
  [SPARC64]: Make IVEC pointers 64-bit.
  [SPARC64]: Fix register usage in xor_raid_4().
  [SPARC64]: Kill pci_memspace_mask.
  [SPARC64]: Consolidate MSI support code.
  [SPARC/64]: Move of_platform_driver initialisations: arch/sparc{,64}.
  [SPARC64]: Fix bugs in SYSV IPC handling in 64-bit processes.
  [SPARC/64]: Prepare to remove of_platform_driver name.
  [SPARC32]: Add irqflags.h to sparc32 and use it from generic code.
  [SPARC64]: beautify vmlinux.lds
  [SPARC]: beautify vmlinux.lds
  [SPARC64]: Enable MSI on sun4u Fire PCI-E controllers.
  ...

diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 774f2493e1ef675ecb9efb5a9abcc32684335882..65b7ae4262381a2b9830dd1ecbb5a487a6a56063 100644 (file)
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -158,18 +158,6 @@ 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
-
 }
 
 /*

diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 412140f02853e687456c58969983814c009518aa..50c56e2814c1e0c6a777ed7ef80534d8e9012d73 100644 (file)
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -308,7 +308,6 @@ 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)

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index cb99daeae936777b45f128783c65fd5622258513..7a1390cd6aad67f407d750a050caa192a9ab8f21 100644 (file)
--- a/drivers/base/memory.c
+++ b/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 kobj_uevent_env *env)
+static int memory_uevent(struct kset *kset, struct kobject *obj, struct kobj_uevent_env *env)
 {
        int retval = 0;
 

diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index 0713a8c71e54b2980d88127644e14cd9ed87f748..233d0f9b3c4b507b0e10e46bc0b936abd6081188 100644 (file)
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -96,30 +96,23 @@ static int sdio_bus_match(struct device *dev, struct device_driver *drv)
 }
 
 static int
-sdio_bus_uevent(struct device *dev, char **envp, int num_envp, char *buf,
-               int buf_size)
+sdio_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
        struct sdio_func *func = dev_to_sdio_func(dev);
-       int i = 0, length = 0;
 
-       if (add_uevent_var(envp, num_envp, &i,
-                       buf, buf_size, &length,
+       if (add_uevent_var(env,
                        "SDIO_CLASS=%02X", func->class))
                return -ENOMEM;
 
-       if (add_uevent_var(envp, num_envp, &i,
-                       buf, buf_size, &length,
+       if (add_uevent_var(env, 
                        "SDIO_ID=%04X:%04X", func->vendor, func->device))
                return -ENOMEM;
 
-       if (add_uevent_var(envp, num_envp, &i,
-                       buf, buf_size, &length,
+       if (add_uevent_var(env,
                        "MODALIAS=sdio:c%02Xv%04Xd%04X",
                        func->class, func->vendor, func->device))
                return -ENOMEM;
 
-       envp[i] = NULL;
-
        return 0;
 }
 

diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ibm_newemac/rgmii.c
index bcd7fc639c40a99411074fcd7bed0891c47be0f6..3f57d6cd26e22b3f84625c049545c0abb376d682 100644 (file)
--- a/drivers/net/ibm_newemac/rgmii.c
+++ b/drivers/net/ibm_newemac/rgmii.c
@@ -251,7 +251,7 @@ static int __devinit rgmii_probe(struct of_device *ofdev,
        }
 
        /* Check for RGMII type */
-       if (device_is_compatible(ofdev->node, "ibm,rgmii-axon"))
+       if (of_device_is_compatible(ofdev->node, "ibm,rgmii-axon"))
                dev->type = RGMII_AXON;
        else
                dev->type = RGMII_STANDARD;

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 035cca0281995cfc12660bb4e47e24434560bcbc..ec36ad78d2fe042aafa149eac1ed3a65d3ace527 100644 (file)
--- a/drivers/serial/mpc52xx_uart.c
+++ b/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 %lx, mapped to %p, irq=%x, freq=%i\n",
-                port->mapbase, port->membase, port->irq, port->uartclk);
+       pr_debug("mpc52xx-psc uart at %p, mapped to %p, irq=%x, freq=%i\n",
+                (void*)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 %lx, irq=%x, freq=%i\n",
-               port->mapbase, port->irq, port->uartclk);
+       dev_dbg(&op->dev, "mpc52xx-psc uart at %p, irq=%x, freq=%i\n",
+               (void*)port->mapbase, port->irq, port->uartclk);
 
        if ((port->irq==NO_IRQ) || !port->mapbase) {
                printk(KERN_ERR "Could not allocate resources for PSC\n");

diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index cfd13eb866b87258acf5e0cc145ebcc8c58231bf..c12a741b5574d21681d5ff5f2c89014675dff010 100644 (file)
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -321,23 +321,17 @@ static int ssb_bus_match(struct device *dev, struct device_driver *drv)
        return 0;
 }
 
-static int ssb_device_uevent(struct device *dev, char **envp, int num_envp,
-                            char *buffer, int buffer_size)
+static int ssb_device_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
        struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
-       int ret, i = 0, length = 0;
 
        if (!dev)
                return -ENODEV;
 
-       ret = add_uevent_var(envp, num_envp, &i,
-                            buffer, buffer_size, &length,
+       return add_uevent_var(env,
                             "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 = {

diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c
index 7c773603b4025f41eacba761bc08484b60a470dd..b6abee846f023a81af3a4ecf3fb015ac642a5e53 100644 (file)
--- a/drivers/ssb/pcmcia.c
+++ b/drivers/ssb/pcmcia.c
@@ -10,6 +10,7 @@
 
 #include <linux/ssb/ssb.h>
 #include <linux/delay.h>
+#include <linux/io.h>
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>

diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c
index bc3e785d8c00838f91cdfdcf73dc6d487540edf0..fe70e72340de4e0735d40f67279a5d4ebcb6ce08 100644 (file)
--- a/drivers/usb/host/ohci-ssb.c
+++ b/drivers/usb/host/ohci-ssb.c
@@ -117,8 +117,10 @@ 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,
 };

diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index 6ef99b2d13ca6f8a4809d5914cbab6309255b3e3..e38d3b7c3ad7b28e5b63909a83885ff535d17f17 100644 (file)
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -84,7 +84,7 @@ static struct xilinxfb_platform_data xilinx_fb_default_pdata = {
        .xres = 640,
        .yres = 480,
        .xvirt = 1024,
-       .yvirt = 480;
+       .yvirt = 480,
 };
 
 /*