avoid via-pmu warnings for non-powerbook configs
PATCH 1/1 avoid via-pmu warnings for non-powerbook configs
drivers/macintosh/via-pmu.c +8 -6
@@ -138,7 +138,6 @@static volatile int adb_int_pending;static volatile int disable_poll;static struct adb_request bright_req_1, bright_req_2; -static unsigned long async_req_locks;static struct device_node *vias;static int pmu_kind =PMU_UNKNOWN ;static int pmu_fully_inited =0 ;
@@ -155,6 +154,7 @@static int option_lid_wakeup =1 ;static int sleep_in_progress;static int can_sleep; +static unsigned long async_req_locks;#endif /* CONFIG_PMAC_PBOOK */ static unsigned int pmu_irq_stats[11 ];
@@ -494,12 +494,9 @@/* Create /proc/pmu */ proc_pmu_root =proc_mkdir ("pmu" ,NULL );if (proc_pmu_root) { -int i; - proc_pmu_info =create_proc_read_entry ("info" ,0 , proc_pmu_root, - proc_get_info,NULL ); - proc_pmu_irqstats =create_proc_read_entry ("interrupts" ,0 , proc_pmu_root, - proc_get_irqstats,NULL );#ifdef CONFIG_PMAC_PBOOK +int i; +for (i=0 ; i<pmu_battery_count; i++) {char title[16 ];sprintf (title,"battery_%d" , i);
@@ -507,6 +504,11 @@ proc_get_batt, (void *)i); }#endif /* CONFIG_PMAC_PBOOK */ + + proc_pmu_info =create_proc_read_entry ("info" ,0 , proc_pmu_root, + proc_get_info,NULL ); + proc_pmu_irqstats =create_proc_read_entry ("interrupts" ,0 , proc_pmu_root, + proc_get_irqstats,NULL ); proc_pmu_options =create_proc_entry ("options" ,0600 , proc_pmu_root);if (proc_pmu_options) { proc_pmu_options->nlink =1 ;
===== drivers/scsi/sd.c 1.155 vs edited =====