diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-19 16:31:03 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-19 16:31:03 -0800 |
commit | 44779149e91ec8e684be23e06dc05197e367a45f (patch) | |
tree | ef1f38740133466f08d12c0a497333d47ab8f7a4 /include/linux/hdreg.h | |
parent | 8ee3f402676bf59caa454b7171ae09c8ac136627 (diff) | |
parent | 17514e8a6f1836a5c95b1f18d2bc0493ad732cf0 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Diffstat (limited to 'include/linux/hdreg.h')
-rw-r--r-- | include/linux/hdreg.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/hdreg.h b/include/linux/hdreg.h index b5d660089de4..2b54eac738ea 100644 --- a/include/linux/hdreg.h +++ b/include/linux/hdreg.h @@ -80,10 +80,12 @@ /* * Define standard taskfile in/out register */ -#define IDE_TASKFILE_STD_OUT_FLAGS 0xFE #define IDE_TASKFILE_STD_IN_FLAGS 0xFE -#define IDE_HOB_STD_OUT_FLAGS 0x3C #define IDE_HOB_STD_IN_FLAGS 0x3C +#ifndef __KERNEL__ +#define IDE_TASKFILE_STD_OUT_FLAGS 0xFE +#define IDE_HOB_STD_OUT_FLAGS 0x3C +#endif typedef unsigned char task_ioreg_t; typedef unsigned long sata_ioreg_t; |