Commit 701daef7 authored by Russell King's avatar Russell King

Merge rmk@master.kernel.org:/home/dwmw2/BK/uart-2.5

into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk
parents dcd48cf5 629959b3
......@@ -2027,11 +2027,11 @@ static int uart_pm(struct pm_dev *dev, pm_request_t rqst, void *data)
switch (rqst) {
case PM_SUSPEND:
case PM_RESUME:
err = uart_pm_set_state(state, (int)data, dev->state);
err = uart_pm_set_state(state, (int)(long)data, dev->state);
break;
case PM_SET_WAKEUP:
err = uart_pm_set_wakeup(state, (int)data);
err = uart_pm_set_wakeup(state, (int)(long)data);
break;
}
return err;
......
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