git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
apm_32.c
diff --git
a/arch/x86/kernel/apm_32.c
b/arch/x86/kernel/apm_32.c
index
965a766
..
0371c48
100644
(file)
--- a/
arch/x86/kernel/apm_32.c
+++ b/
arch/x86/kernel/apm_32.c
@@
-229,11
+229,11
@@
#include <linux/jiffies.h>
#include <linux/acpi.h>
#include <linux/syscore_ops.h>
#include <linux/jiffies.h>
#include <linux/acpi.h>
#include <linux/syscore_ops.h>
+#include <linux/i8253.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/desc.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/desc.h>
-#include <asm/i8253.h>
#include <asm/olpc.h>
#include <asm/paravirt.h>
#include <asm/reboot.h>
#include <asm/olpc.h>
#include <asm/paravirt.h>
#include <asm/reboot.h>
@@
-1220,11
+1220,11
@@
static void reinit_timer(void)
raw_spin_lock_irqsave(&i8253_lock, flags);
/* set the clock to HZ */
raw_spin_lock_irqsave(&i8253_lock, flags);
/* set the clock to HZ */
- outb_p
it(0x34, PIT_MODE);
/* binary, mode 2, LSB/MSB, ch 0 */
+ outb_p
(0x34, PIT_MODE);
/* binary, mode 2, LSB/MSB, ch 0 */
udelay(10);
udelay(10);
- outb_p
it(LATCH & 0xff, PIT_CH0);
/* LSB */
+ outb_p
(LATCH & 0xff, PIT_CH0);
/* LSB */
udelay(10);
udelay(10);
- outb_p
it(LATCH >> 8, PIT_CH0);
/* MSB */
+ outb_p
(LATCH >> 8, PIT_CH0);
/* MSB */
udelay(10);
raw_spin_unlock_irqrestore(&i8253_lock, flags);
#endif
udelay(10);
raw_spin_unlock_irqrestore(&i8253_lock, flags);
#endif