diff options
| author | Richard Russon <ntfs@flatcap.org> | 2004-10-19 03:56:13 +0100 |
|---|---|---|
| committer | Richard Russon <ntfs@flatcap.org> | 2004-10-19 03:56:13 +0100 |
| commit | 3c1bc7bdf1f87c53f56a1cb0aca2790971efe884 (patch) | |
| tree | ad4bc781c22aa2456e6ef0e1ea99db7a4cd792e1 /include/linux | |
| parent | 01a238627f19bc4e4fe29ded038cc1ca5b824442 (diff) | |
| parent | 6db492bc88fa4eb1560460b908cd8c3a76632029 (diff) | |
Merge flatcap.org:/home/flatcap/backup/bk/linux-2.6
into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/compiler.h | 1 | ||||
| -rw-r--r-- | include/linux/libata.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 62949aa638bb..8a00ec5f7c62 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -17,6 +17,7 @@ extern void __chk_io_ptr(void __iomem *); # define __iomem # define __chk_user_ptr(x) (void)0 # define __chk_io_ptr(x) (void)0 +#define __builtin_warning(x, ...) (1) #endif #ifdef __KERNEL__ diff --git a/include/linux/libata.h b/include/linux/libata.h index 171b06794ada..407b4adc06d1 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -189,6 +189,7 @@ struct ata_probe_ent { Scsi_Host_Template *sht; struct ata_ioports port[ATA_MAX_PORTS]; unsigned int n_ports; + unsigned int hard_port_no; unsigned int pio_mask; unsigned int mwdma_mask; unsigned int udma_mask; @@ -273,6 +274,7 @@ struct ata_port { unsigned long flags; /* ATA_FLAG_xxx */ unsigned int id; /* unique id req'd by scsi midlyr */ unsigned int port_no; /* unique port #; from zero */ + unsigned int hard_port_no; /* hardware port #; from zero */ struct ata_prd *prd; /* our SG list */ dma_addr_t prd_dma; /* and its DMA mapping */ |