ppc64: Fix build of via-pmu driver on 64 bits kernel.

parent 02a9d5ff
...@@ -374,7 +374,9 @@ find_via_pmu(void) ...@@ -374,7 +374,9 @@ find_via_pmu(void)
printk(KERN_INFO "PMU driver %d initialized for %s, firmware: %02x\n", printk(KERN_INFO "PMU driver %d initialized for %s, firmware: %02x\n",
PMU_DRIVER_VERSION, pbook_type[pmu_kind], pmu_version); PMU_DRIVER_VERSION, pbook_type[pmu_kind], pmu_version);
#ifndef CONFIG_PPC64
sys_ctrler = SYS_CTRLER_PMU; sys_ctrler = SYS_CTRLER_PMU;
#endif
return 1; return 1;
} }
...@@ -459,7 +461,9 @@ static int __init via_pmu_dev_init(void) ...@@ -459,7 +461,9 @@ static int __init via_pmu_dev_init(void)
if (vias == NULL) if (vias == NULL)
return -ENODEV; return -ENODEV;
#ifndef CONFIG_PPC64
request_OF_resource(vias, 0, NULL); request_OF_resource(vias, 0, NULL);
#endif
#ifdef CONFIG_PMAC_BACKLIGHT #ifdef CONFIG_PMAC_BACKLIGHT
/* Enable backlight */ /* Enable backlight */
register_backlight_controller(&pmu_backlight_controller, NULL, "pmu"); register_backlight_controller(&pmu_backlight_controller, NULL, "pmu");
...@@ -590,6 +594,7 @@ pmu_get_model(void) ...@@ -590,6 +594,7 @@ pmu_get_model(void)
return pmu_kind; return pmu_kind;
} }
#ifndef CONFIG_PPC64
static inline void wakeup_decrementer(void) static inline void wakeup_decrementer(void)
{ {
set_dec(tb_ticks_per_jiffy); set_dec(tb_ticks_per_jiffy);
...@@ -598,6 +603,7 @@ static inline void wakeup_decrementer(void) ...@@ -598,6 +603,7 @@ static inline void wakeup_decrementer(void)
*/ */
last_jiffy_stamp(0) = tb_last_stamp = get_tbl(); last_jiffy_stamp(0) = tb_last_stamp = get_tbl();
} }
#endif
static void pmu_set_server_mode(int server_mode) static void pmu_set_server_mode(int server_mode)
{ {
...@@ -1389,7 +1395,7 @@ pmu_handle_data(unsigned char *data, int len, struct pt_regs *regs) ...@@ -1389,7 +1395,7 @@ pmu_handle_data(unsigned char *data, int len, struct pt_regs *regs)
} }
pmu_done(req); pmu_done(req);
} else { } else {
#ifdef CONFIG_XMON #if defined(CONFIG_XMON) && !defined(CONFIG_PPC64)
if (len == 4 && data[1] == 0x2c) { if (len == 4 && data[1] == 0x2c) {
extern int xmon_wants_key, xmon_adb_keycode; extern int xmon_wants_key, xmon_adb_keycode;
if (xmon_wants_key) { if (xmon_wants_key) {
...@@ -1397,7 +1403,7 @@ pmu_handle_data(unsigned char *data, int len, struct pt_regs *regs) ...@@ -1397,7 +1403,7 @@ pmu_handle_data(unsigned char *data, int len, struct pt_regs *regs)
return; return;
} }
} }
#endif /* CONFIG_XMON */ #endif /* defined(CONFIG_XMON) && !defined(CONFIG_PPC64) */
#ifdef CONFIG_ADB #ifdef CONFIG_ADB
/* /*
* XXX On the [23]400 the PMU gives us an up * XXX On the [23]400 the PMU gives us an up
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment