X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fparisc%2Flasi.c;h=cb3d281761293f82eb5e7fbeec1e26d28d7bc473;hb=8a371840f825be20354007537b6568b77448b685;hp=a8c20396ffbe68e984c9512c7aa9cca8766b9e8d;hpb=596c96ba06e5d56e72451e02f93f4e15e17458df;p=powerpc.git

diff --git a/drivers/parisc/lasi.c b/drivers/parisc/lasi.c
index a8c20396ff..cb3d281761 100644
--- a/drivers/parisc/lasi.c
+++ b/drivers/parisc/lasi.c
@@ -150,7 +150,7 @@ void __init lasi_led_init(unsigned long lasi_hpa)
  * 
  */
 
-static unsigned long lasi_power_off_hpa;
+static unsigned long lasi_power_off_hpa __read_mostly;
 
 static void lasi_power_off(void)
 {
@@ -166,11 +166,12 @@ static void lasi_power_off(void)
 int __init
 lasi_init_chip(struct parisc_device *dev)
 {
+	extern void (*chassis_power_off)(void);
 	struct gsc_asic *lasi;
 	struct gsc_irq gsc_irq;
 	int ret;
 
-	lasi = kmalloc(sizeof(*lasi), GFP_KERNEL);
+	lasi = kzalloc(sizeof(*lasi), GFP_KERNEL);
 	if (!lasi)
 		return -ENOMEM;
 
@@ -222,7 +223,7 @@ lasi_init_chip(struct parisc_device *dev)
 	 * ensure that only the first LASI (the one controlling the power off)
 	 * should set the HPA here */
 	lasi_power_off_hpa = lasi->hpa;
-	pm_power_off = lasi_power_off;
+	chassis_power_off = lasi_power_off;
 	
 	return ret;
 }