Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: video drivers: add facility level
  sparc: tcx.c make tcx_init and tcx_exit static
  sparc: ffb.c make ffb_init and ffb_exit static
  sparc: cg14.c make cg14_init and cg15_exit static
  sparc: bw2.c fix bw2_exit
  sparc64: Fix accidental syscall restart on child return from clone/fork/vfork.
  sparc64: Clean up handling of pt_regs trap type encoding.
  sparc: Remove old style signal frame support.
  sparc64: Kill bogus RT_ALIGNEDSZ macro from signal.c
  sparc: sunzilog.c remove unused argument
  sparc: fix drivers/video/tcx.c warning
  sparc64: Kill unused local ISA bus layer.
  input: Rewrite sparcspkr device probing.
  sparc64: Do not ignore 'pmu' device ranges.
  sparc64: Kill ISA_FLOPPY_WORKS code.
  sparc64: Kill CONFIG_SPARC32_COMPAT
  sparc64: Cleanups and corrections for arch/sparc64/Kconfig
  sparc64: Fix wedged irq regression.

8 files changed, 17 insertions, 19 deletions

diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index 833b10c84064..275d9dab0c61 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -339,7 +339,7 @@ static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *
 
         dev_set_drvdata(&op->dev, info);
 
-        printk("%s: bwtwo at %lx:%lx\n",
+        printk(KERN_INFO "%s: bwtwo at %lx:%lx\n",
                dp->full_name, par->which_io, par->physbase);
 
         return 0;
@@ -399,10 +399,9 @@ static int __init bw2_init(void)
 
 static void __exit bw2_exit(void)
 {
-        return of_unregister_driver(&bw2_driver);
+        of_unregister_driver(&bw2_driver);
 }
 
-
 module_init(bw2_init);
 module_exit(bw2_exit);
 
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index fdc9f43ec30a..0db0fecba93b 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -556,7 +556,7 @@ static int __devinit cg14_probe(struct of_device *op, const struct of_device_id
 
         dev_set_drvdata(&op->dev, info);
 
-        printk("%s: cgfourteen at %lx:%lx, %dMB\n",
+        printk(KERN_INFO "%s: cgfourteen at %lx:%lx, %dMB\n",
                dp->full_name,
                par->iospace, par->physbase,
                par->ramsize >> 20);
@@ -605,7 +605,7 @@ static struct of_platform_driver cg14_driver = {
         .remove         = __devexit_p(cg14_remove),
 };
 
-int __init cg14_init(void)
+static int __init cg14_init(void)
 {
         if (fb_get_options("cg14fb", NULL))
                 return -ENODEV;
@@ -613,7 +613,7 @@ int __init cg14_init(void)
         return of_register_driver(&cg14_driver, &of_bus_type);
 }
 
-void __exit cg14_exit(void)
+static void __exit cg14_exit(void)
 {
         of_unregister_driver(&cg14_driver);
 }
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index a5c7fb331527..010ea53978f8 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -419,7 +419,7 @@ static int __devinit cg3_probe(struct of_device *op,
 
         dev_set_drvdata(&op->dev, info);
 
-        printk("%s: cg3 at %lx:%lx\n",
+        printk(KERN_INFO "%s: cg3 at %lx:%lx\n",
                dp->full_name, par->which_io, par->physbase);
 
         return 0;
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 549891d76ef5..fc90db6da65a 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -781,7 +781,7 @@ static int __devinit cg6_probe(struct of_device *op,
 
         dev_set_drvdata(&op->dev, info);
 
-        printk("%s: CGsix [%s] at %lx:%lx\n",
+        printk(KERN_INFO "%s: CGsix [%s] at %lx:%lx\n",
                dp->full_name, info->fix.id,
                par->which_io, par->physbase);
 
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index d7e24889650e..93dca3e2aa50 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -32,7 +32,6 @@
 static int ffb_setcolreg(unsigned, unsigned, unsigned, unsigned,
                          unsigned, struct fb_info *);
 static int ffb_blank(int, struct fb_info *);
-static void ffb_init_fix(struct fb_info *);
 
 static void ffb_imageblit(struct fb_info *, const struct fb_image *);
 static void ffb_fillrect(struct fb_info *, const struct fb_fillrect *);
@@ -1001,7 +1000,7 @@ static int __devinit ffb_probe(struct of_device *op,
 
         dev_set_drvdata(&op->dev, info);
 
-        printk("%s: %s at %016lx, type %d, "
+        printk(KERN_INFO "%s: %s at %016lx, type %d, "
                "DAC pnum[%x] rev[%d] manuf_rev[%d]\n",
                dp->full_name,
                ((par->flags & FFB_FLAG_AFB) ? "AFB" : "FFB"),
@@ -1062,7 +1061,7 @@ static struct of_platform_driver ffb_driver = {
         .remove         = __devexit_p(ffb_remove),
 };
 
-int __init ffb_init(void)
+static int __init ffb_init(void)
 {
         if (fb_get_options("ffb", NULL))
                 return -ENODEV;
@@ -1070,7 +1069,7 @@ int __init ffb_init(void)
         return of_register_driver(&ffb_driver, &of_bus_type);
 }
 
-void __exit ffb_exit(void)
+static void __exit ffb_exit(void)
 {
         of_unregister_driver(&ffb_driver);
 }
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index 45b9a5d55dec..f3160fc29795 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -614,7 +614,7 @@ static int __devinit leo_probe(struct of_device *op, const struct of_device_id *
 
         dev_set_drvdata(&op->dev, info);
 
-        printk("%s: leo at %lx:%lx\n",
+        printk(KERN_INFO "%s: leo at %lx:%lx\n",
                dp->full_name,
                par->which_io, par->physbase);
 
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index 58496061142d..c95874fe9076 100644
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -310,7 +310,7 @@ static int __devinit p9100_probe(struct of_device *op, const struct of_device_id
 
         dev_set_drvdata(&op->dev, info);
 
-        printk("%s: p9100 at %lx:%lx\n",
+        printk(KERN_INFO "%s: p9100 at %lx:%lx\n",
                dp->full_name,
                par->which_io, par->physbase);
 
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index e5a9ddb3c8be..a71774305772 100644
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -419,7 +419,7 @@ static int __devinit tcx_init_one(struct of_device *op)
                 par->mmap_map[6].size = SBUS_MMAP_EMPTY;
         }
 
-        par->physbase = 0;
+        par->physbase = op->resource[0].start;
         par->which_io = op->resource[0].flags & IORESOURCE_BITS;
 
         for (i = 0; i < TCX_MMAP_ENTRIES; i++) {
@@ -470,10 +470,10 @@ static int __devinit tcx_init_one(struct of_device *op)
 
         dev_set_drvdata(&op->dev, info);
 
-        printk("%s: TCX at %lx:%lx, %s\n",
+        printk(KERN_INFO "%s: TCX at %lx:%lx, %s\n",
                dp->full_name,
                par->which_io,
-               op->resource[0].start,
+               par->physbase,
                par->lowdepth ? "8-bit only" : "24-bit depth");
 
         return 0;
@@ -527,7 +527,7 @@ static struct of_platform_driver tcx_driver = {
         .remove         = __devexit_p(tcx_remove),
 };
 
-int __init tcx_init(void)
+static int __init tcx_init(void)
 {
         if (fb_get_options("tcxfb", NULL))
                 return -ENODEV;
@@ -535,7 +535,7 @@ int __init tcx_init(void)
         return of_register_driver(&tcx_driver, &of_bus_type);
 }
 
-void __exit tcx_exit(void)
+static void __exit tcx_exit(void)
 {
         of_unregister_driver(&tcx_driver);
 }