diff --git a/[refs] b/[refs] index 3fc3d8b54350..e4c6ed59c383 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecaedfa385a6df297e17d6e9f296cc63f12c053f +refs/heads/master: 08d7b5ac29f76ccd21f5f692cb1a34d08c37ab59 diff --git a/trunk/Documentation/DocBook/deviceiobook.tmpl b/trunk/Documentation/DocBook/deviceiobook.tmpl index c917de681ccd..361c884d860d 100644 --- a/trunk/Documentation/DocBook/deviceiobook.tmpl +++ b/trunk/Documentation/DocBook/deviceiobook.tmpl @@ -316,7 +316,7 @@ CPU B: spin_unlock_irqrestore(&dev_lock, flags) Public Functions Provided -!Iinclude/asm-i386/io.h +!Iinclude/asm-x86/io_32.h !Elib/iomap.c