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 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
block
/
hd.c
diff --git
a/drivers/block/hd.c
b/drivers/block/hd.c
index
007c630
..
b52c9ca
100644
(file)
--- a/
drivers/block/hd.c
+++ b/
drivers/block/hd.c
@@
-155,7
+155,7
@@
else \
#if (HD_DELAY > 0)
-#include <
asm
/i8253.h>
+#include <
linux
/i8253.h>
unsigned long last_req;