diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:39:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:39:30 -0400 |
| commit | 22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13 (patch) | |
| tree | 7ef158ba2c30e0dde2dc103d1904fae243759a6b /drivers/scsi/initio.h | |
| parent | 39302175c26d74be35715c05a0f342c9e64c21bf (diff) | |
| parent | 6ab3d5624e172c553004ecc862bfeac16d9d68b7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Remove obsolete #include <linux/config.h>
remove obsolete swsusp_encrypt
arch/arm26/Kconfig typos
Documentation/IPMI typos
Kconfig: Typos in net/sched/Kconfig
v9fs: do not include linux/version.h
Documentation/DocBook/mtdnand.tmpl: typo fixes
typo fixes: specfic -> specific
typo fixes in Documentation/networking/pktgen.txt
typo fixes: occuring -> occurring
typo fixes: infomation -> information
typo fixes: disadvantadge -> disadvantage
typo fixes: aquire -> acquire
typo fixes: mecanism -> mechanism
typo fixes: bandwith -> bandwidth
fix a typo in the RTC_CLASS help text
smb is no longer maintained
Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
Diffstat (limited to 'drivers/scsi/initio.h')
| -rw-r--r-- | drivers/scsi/initio.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/scsi/initio.h b/drivers/scsi/initio.h index 3efb1184fc39..acb67a4af2cc 100644 --- a/drivers/scsi/initio.h +++ b/drivers/scsi/initio.h | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | **************************************************************************/ | 54 | **************************************************************************/ |
| 55 | 55 | ||
| 56 | 56 | ||
| 57 | #include <linux/config.h> | ||
| 58 | #include <linux/types.h> | 57 | #include <linux/types.h> |
| 59 | 58 | ||
| 60 | #define ULONG unsigned long | 59 | #define ULONG unsigned long |
| @@ -193,13 +192,13 @@ typedef struct { | |||
| 193 | #define TSC_SEL_ATN_DIRECT_OUT 0x15 /* Select With ATN Sequence */ | 192 | #define TSC_SEL_ATN_DIRECT_OUT 0x15 /* Select With ATN Sequence */ |
| 194 | #define TSC_SEL_ATN3_DIRECT_IN 0xB5 /* Select With ATN3 Sequence */ | 193 | #define TSC_SEL_ATN3_DIRECT_IN 0xB5 /* Select With ATN3 Sequence */ |
| 195 | #define TSC_SEL_ATN3_DIRECT_OUT 0x35 /* Select With ATN3 Sequence */ | 194 | #define TSC_SEL_ATN3_DIRECT_OUT 0x35 /* Select With ATN3 Sequence */ |
| 196 | #define TSC_XF_DMA_OUT_DIRECT 0x06 /* DMA Xfer Infomation out */ | 195 | #define TSC_XF_DMA_OUT_DIRECT 0x06 /* DMA Xfer Information out */ |
| 197 | #define TSC_XF_DMA_IN_DIRECT 0x86 /* DMA Xfer Infomation in */ | 196 | #define TSC_XF_DMA_IN_DIRECT 0x86 /* DMA Xfer Information in */ |
| 198 | 197 | ||
| 199 | #define TSC_XF_DMA_OUT 0x43 /* DMA Xfer Infomation out */ | 198 | #define TSC_XF_DMA_OUT 0x43 /* DMA Xfer Information out */ |
| 200 | #define TSC_XF_DMA_IN 0xC3 /* DMA Xfer Infomation in */ | 199 | #define TSC_XF_DMA_IN 0xC3 /* DMA Xfer Information in */ |
| 201 | #define TSC_XF_FIFO_OUT 0x03 /* FIFO Xfer Infomation out */ | 200 | #define TSC_XF_FIFO_OUT 0x03 /* FIFO Xfer Information out */ |
| 202 | #define TSC_XF_FIFO_IN 0x83 /* FIFO Xfer Infomation in */ | 201 | #define TSC_XF_FIFO_IN 0x83 /* FIFO Xfer Information in */ |
| 203 | 202 | ||
| 204 | #define TSC_MSG_ACCEPT 0x0F /* Message Accept */ | 203 | #define TSC_MSG_ACCEPT 0x0F /* Message Accept */ |
| 205 | 204 | ||