diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 19:43:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 19:43:29 -0500 |
commit | 3f02d072d46bb409e8ca3cf16c0511f5c21adaf6 (patch) | |
tree | baec074db38a5ceaaabbcee76f199acef43bb42a /Documentation/ioctl/hdio.txt | |
parent | 0238cb4e7583c521bb3538060f98a73e65f61324 (diff) | |
parent | fb453d4b0b51ea71c9eb8192c61b768afeb7ee8a (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'Documentation/ioctl/hdio.txt')
-rw-r--r-- | Documentation/ioctl/hdio.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ioctl/hdio.txt b/Documentation/ioctl/hdio.txt index 9a7aea0636a5..11c9be49f37c 100644 --- a/Documentation/ioctl/hdio.txt +++ b/Documentation/ioctl/hdio.txt | |||
@@ -946,7 +946,7 @@ HDIO_SCAN_HWIF register and (re)scan interface | |||
946 | 946 | ||
947 | This ioctl initializes the addresses and irq for a disk | 947 | This ioctl initializes the addresses and irq for a disk |
948 | controller, probes for drives, and creates /proc/ide | 948 | controller, probes for drives, and creates /proc/ide |
949 | interfaces as appropiate. | 949 | interfaces as appropriate. |
950 | 950 | ||
951 | 951 | ||
952 | 952 | ||