diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-26 13:51:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-26 13:51:35 +0200 |
| commit | de66ee979d0ea45171cc2501750e9f9f22f5a690 (patch) | |
| tree | 5ab1a5c6b596b9b786902fb380274e1e1f4ceb13 /arch/tile/include/asm/parport.h | |
| parent | 916f676f8dc016103f983c7ec54c18ecdbb6e349 (diff) | |
| parent | 4db70f73e56961b9bcdfd0c36c62847a18b7dbb5 (diff) | |
| download | op-kernel-dev-de66ee979d0ea45171cc2501750e9f9f22f5a690.zip op-kernel-dev-de66ee979d0ea45171cc2501750e9f9f22f5a690.tar.gz | |
Merge branch 'linus' into x86/urgent
Merge reason: we want to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/tile/include/asm/parport.h')
| -rw-r--r-- | arch/tile/include/asm/parport.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/tile/include/asm/parport.h b/arch/tile/include/asm/parport.h new file mode 100644 index 0000000..cf252af --- /dev/null +++ b/arch/tile/include/asm/parport.h @@ -0,0 +1 @@ +#include <asm-generic/parport.h> |
