Skip to content

L
linux
Commit c7790d68 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge bk://gkernel.bkbits.net/libata-2.6 

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 348fe6fa fac172c3
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/linux/ata.h
View file @ c7790d68
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#ifndef __LINUX_ATA_H__ #ifndef __LINUX_ATA_H__
#define __LINUX_ATA_H__ #define __LINUX_ATA_H__
#include <linux/types.h>
/* defines only for the constants which don't work well as enums */ /* defines only for the constants which don't work well as enums */
#define ATA_DMA_BOUNDARY 0xffffUL #define ATA_DMA_BOUNDARY 0xffffUL
#define ATA_DMA_MASK 0xffffffffULL #define ATA_DMA_MASK 0xffffffffULL
...@@ -140,8 +142,6 @@ enum { ...@@ -140,8 +142,6 @@ enum {
XFER_PIO_2 = 0x0A, XFER_PIO_2 = 0x0A,
XFER_PIO_1 = 0x09, XFER_PIO_1 = 0x09,
XFER_PIO_0 = 0x08, XFER_PIO_0 = 0x08,
/* legacy IDE 'stuff' */
XFER_SW_DMA_2 = 0x12, XFER_SW_DMA_2 = 0x12,
XFER_SW_DMA_1 = 0x11, XFER_SW_DMA_1 = 0x11,
XFER_SW_DMA_0 = 0x10, XFER_SW_DMA_0 = 0x10,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7