OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.16/core' of git://git.kernel.dk/linux-block into next
[uclinux-h8/linux.git]
/
drivers
/
block
/
ataflop.c
diff --git
a/drivers/block/ataflop.c
b/drivers/block/ataflop.c
index
7e8a55f
..
2104b1b
100644
(file)
--- a/
drivers/block/ataflop.c
+++ b/
drivers/block/ataflop.c
@@
-1952,7
+1952,7
@@
static int __init atari_floppy_init (void)
goto Enomem;
}
TrackBuffer = DMABuffer + 512;
- PhysDMABuffer =
virt
_to_phys(DMABuffer);
+ PhysDMABuffer =
atari_stram
_to_phys(DMABuffer);
PhysTrackBuffer = virt_to_phys(TrackBuffer);
BufferDrive = BufferSide = BufferTrack = -1;