diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-20 16:27:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-20 16:27:34 -0700 |
| commit | 83ba37105e262d374b9092a572b8ee6e30aa9f70 (patch) | |
| tree | 57b05e00c8beab98bb8c0116fece95d4461efd83 | |
| parent | 516bd664153d76f5c814633cee6500e2ff8e861b (diff) | |
| parent | 9fe41e4197f351bc78547ab2d8808e1aca30d87c (diff) | |
Merge branch 'linuxdocs' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs
* 'linuxdocs' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs:
documentation: fix almost duplicate filenames (IO/io-mapping.txt)
| -rw-r--r-- | Documentation/00-INDEX | 6 | ||||
| -rw-r--r-- | Documentation/bus-virt-phys-mapping.txt (renamed from Documentation/IO-mapping.txt) | 0 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index dd10b51b4e6..5405f7aecef 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX @@ -32,8 +32,6 @@ DocBook/ - directory with DocBook templates etc. for kernel documentation. HOWTO - the process and procedures of how to do Linux kernel development. -IO-mapping.txt - - how to access I/O mapped memory from within device drivers. IPMI.txt - info on Linux Intelligent Platform Management Interface (IPMI) Driver. IRQ-affinity.txt @@ -84,6 +82,8 @@ blockdev/ - info on block devices & drivers btmrvl.txt - info on Marvell Bluetooth driver usage. +bus-virt-phys-mapping.txt + - how to access I/O mapped memory from within device drivers. cachetlb.txt - describes the cache/TLB flushing interfaces Linux uses. cdrom/ @@ -168,6 +168,8 @@ initrd.txt - how to use the RAM disk as an initial/temporary root filesystem. input/ - info on Linux input device support. +io-mapping.txt + - description of io_mapping functions in linux/io-mapping.h io_ordering.txt - info on ordering I/O writes to memory-mapped addresses. ioctl/ diff --git a/Documentation/IO-mapping.txt b/Documentation/bus-virt-phys-mapping.txt index 1b5aa10df84..1b5aa10df84 100644 --- a/Documentation/IO-mapping.txt +++ b/Documentation/bus-virt-phys-mapping.txt |