From df19457eb0ed0fe9be4c40f009a64d1ef9ed8036 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 18 Jul 2007 21:18:50 -0700 Subject: [PATCH] --- yaml --- r: 61974 b: refs/heads/master c: 2a26302164e0d26df94810ffa2eabcad0fc55c95 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/power.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9cb46105c21b..0cb52629bb5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91ba3c2128e9ee490a9f04bcd5b54749b18e4410 +refs/heads/master: 2a26302164e0d26df94810ffa2eabcad0fc55c95 diff --git a/trunk/arch/sparc64/kernel/power.c b/trunk/arch/sparc64/kernel/power.c index 7471e844724d..39f9f6494d4c 100644 --- a/trunk/arch/sparc64/kernel/power.c +++ b/trunk/arch/sparc64/kernel/power.c @@ -83,7 +83,7 @@ static int __devinit power_probe(struct of_device *op, const struct of_device_id power_reg = of_ioremap(res, 0, 0x4, "power"); - printk("%s: Control reg at %lx ... ", + printk(KERN_INFO "%s: Control reg at %lx\n", op->node->name, res->start); poweroff_method = machine_halt; /* able to use the standard halt */ @@ -92,8 +92,6 @@ static int __devinit power_probe(struct of_device *op, const struct of_device_id if (request_irq(irq, power_handler, 0, "power", NULL) < 0) printk(KERN_ERR "power: Cannot setup IRQ handler.\n"); - } else { - printk(KERN_INFO "power: Not using powerd.\n"); } return 0;