sparc,sparc64: unify kernel/

o Move all files from sparc64/kernel/ to sparc/kernel
  - rename as appropriate
o Update sparc/Makefile to the changes
o Update sparc/kernel/Makefile to include the sparc64 files

NOTE: This commit changes link order on sparc64!

Link order had to change for either of sparc32 and sparc64.
And assuming sparc64 see more testing than sparc32 change link
order on sparc64 where issues will be caught faster.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 0 insertions, 75 deletions

diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c
deleted file mode 100644
index 076cad7f975..00000000000
--- a/arch/sparc64/kernel/power.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* power.c: Power management driver.
- *
- * Copyright (C) 1999, 2007, 2008 David S. Miller (davem@davemloft.net)
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/reboot.h>
-#include <linux/of_device.h>
-
-#include <asm/prom.h>
-#include <asm/io.h>
-
-static void __iomem *power_reg;
-
-static irqreturn_t power_handler(int irq, void *dev_id)
-{
-	orderly_poweroff(true);
-
-	/* FIXME: Check registers for status... */
-	return IRQ_HANDLED;
-}
-
-static int __init has_button_interrupt(unsigned int irq, struct device_node *dp)
-{
-	if (irq == 0xffffffff)
-		return 0;
-	if (!of_find_property(dp, "button", NULL))
-		return 0;
-
-	return 1;
-}
-
-static int __devinit power_probe(struct of_device *op, const struct of_device_id *match)
-{
-	struct resource *res = &op->resource[0];
-	unsigned int irq= op->irqs[0];
-
-	power_reg = of_ioremap(res, 0, 0x4, "power");
-
-	printk(KERN_INFO "%s: Control reg at %lx\n",
-	       op->node->name, res->start);
-
-	if (has_button_interrupt(irq, op->node)) {
-		if (request_irq(irq,
-				power_handler, 0, "power", NULL) < 0)
-			printk(KERN_ERR "power: Cannot setup IRQ handler.\n");
-	}
-
-	return 0;
-}
-
-static struct of_device_id __initdata power_match[] = {
-	{
-		.name = "power",
-	},
-	{},
-};
-
-static struct of_platform_driver power_driver = {
-	.match_table	= power_match,
-	.probe		= power_probe,
-	.driver		= {
-		.name	= "power",
-	},
-};
-
-static int __init power_init(void)
-{
-	return of_register_driver(&power_driver, &of_platform_bus_type);
-}
-
-device_initcall(power_init);