Merge

6 files changed, 52 insertions, 106 deletions

diff --git a/include/linux/dvb/ca.h b/include/linux/dvb/ca.h
index b7ce90ec3618..a0bdd645c745 100644
--- a/include/linux/dvb/ca.h
+++ b/include/linux/dvb/ca.h
@@ -26,7 +26,7 @@
 
 /* slot interface types and info */
 
-typedef struct ca_slot_info_s {
+typedef struct ca_slot_info {
         int num;               /* slot number */
 
         int type;              /* CA interface this slot supports */
@@ -43,7 +43,7 @@ typedef struct ca_slot_info_s {
 
 /* descrambler types and info */
 
-typedef struct ca_descr_info_s {
+typedef struct ca_descr_info {
         unsigned int num;          /* number of available descramblers (keys) */ 
         unsigned int type;         /* type of supported scrambling system */
 #define CA_ECD           1
@@ -51,29 +51,29 @@ typedef struct ca_descr_info_s {
 #define CA_DSS           4
 } ca_descr_info_t;
 
-typedef struct ca_cap_s {
+typedef struct ca_caps {
         unsigned int slot_num;     /* total number of CA card and module slots */
         unsigned int slot_type;    /* OR of all supported types */
         unsigned int descr_num;    /* total number of descrambler slots (keys) */
         unsigned int descr_type;   /* OR of all supported types */
-} ca_cap_t;
+} ca_caps_t;
 
 /* a message to/from a CI-CAM */
-typedef struct ca_msg_s {   
+typedef struct ca_msg {   
         unsigned int index;         
         unsigned int type;
         unsigned int length;
         unsigned char msg[256];
 } ca_msg_t;
 
-typedef struct ca_descr_s {
+typedef struct ca_descr {
         unsigned int index;    
         unsigned int parity;
         unsigned char cw[8];
 } ca_descr_t;
 
 #define CA_RESET          _IO('o', 128)
-#define CA_GET_CAP        _IOR('o', 129, ca_cap_t)
+#define CA_GET_CAP        _IOR('o', 129, ca_caps_t)
 #define CA_GET_SLOT_INFO  _IOR('o', 130, ca_slot_info_t)
 #define CA_GET_DESCR_INFO _IOR('o', 131, ca_descr_info_t)
 #define CA_GET_MSG        _IOR('o', 132, ca_msg_t)
diff --git a/include/linux/dvb/osd.h b/include/linux/dvb/osd.h
index 143c8296f895..760ccff6c75c 100644
--- a/include/linux/dvb/osd.h
+++ b/include/linux/dvb/osd.h
@@ -26,7 +26,7 @@
 
 typedef enum {
 	// All functions return -2 on "not open"
-	OSD_Close = 1,		// ()
+  OSD_Close=1,    // ()
 	// Disables OSD and releases the buffers
 	// returns 0 on success
 	OSD_Open,		// (x0,y0,x1,y1,BitPerPixel[2/4/8](color&0x0F),mix[0..15](color&0xF0))
@@ -108,3 +108,4 @@ typedef struct osd_cmd_s {
 #define OSD_SEND_CMD       _IOW('o', 160, osd_cmd_t)
 
 #endif
+
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 4d1b4c56c7a0..c4fdbf756d52 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -299,9 +299,9 @@ typedef enum {	ide_unknown,	ide_generic,	ide_pci,
 
 typedef struct ide_io_ops_s {
 	/* insert io operations here! */
-	void (*OUTB)(u8 addr, ide_ioreg_t port);
-	void (*OUTW)(u16 addr, ide_ioreg_t port);
-	void (*OUTL)(u32 addr, ide_ioreg_t port);
+	void (*OUTB)(u8 value, ide_ioreg_t port);
+	void (*OUTW)(u16 value, ide_ioreg_t port);
+	void (*OUTL)(u32 value, ide_ioreg_t port);
 	void (*OUTSW)(ide_ioreg_t port, void *addr, u32 count);
 	void (*OUTSL)(ide_ioreg_t port, void *addr, u32 count);
 
@@ -740,6 +740,7 @@ typedef struct ide_drive_s {
 	u8	nice1;			/* give potential excess bandwidth */
 
 	unsigned present	: 1;	/* drive is physically present */
+	unsigned dead		: 1;	/* device ejected hint */
 	unsigned noprobe 	: 1;	/* from:  hdx=noprobe */
 	unsigned removable	: 1;	/* 1 if need to do check_media_change */
 	unsigned is_flash	: 1;	/* 1 if probed as flash */
@@ -756,6 +757,7 @@ typedef struct ide_drive_s {
 	unsigned remap_0_to_1	: 2;	/* 0=remap if ezdrive, 1=remap, 2=noremap */
 	unsigned ata_flash	: 1;	/* 1=present, 0=default */
 	unsigned blocked        : 1;	/* 1=powermanagment told us not to do anything, so sleep nicely */
+	unsigned vdma		: 1;	/* 1=doing PIO over DMA 0=doing normal DMA */
 	unsigned queue_setup	: 1;
 	unsigned addressing;		/*      : 3;
 					 *  0=28-bit
@@ -1189,9 +1191,7 @@ typedef struct ide_driver_s {
 	unsigned supports_dma		: 1;
 	unsigned supports_dsc_overlap	: 1;
 	int		(*cleanup)(ide_drive_t *);
-	int		(*standby)(ide_drive_t *);
-	int		(*suspend)(ide_drive_t *);
-	int		(*resume)(ide_drive_t *);
+	int		(*shutdown)(ide_drive_t *);
 	int		(*flushcache)(ide_drive_t *);
 	ide_startstop_t	(*do_request)(ide_drive_t *, struct request *, sector_t);
 	int		(*end_request)(ide_drive_t *, int, int);
@@ -1599,6 +1599,8 @@ extern int ideprobe_init(void);
 extern void ide_scan_pcibus(int scan_direction) __init;
 extern int ide_pci_register_driver(struct pci_driver *driver);
 extern void ide_pci_unregister_driver(struct pci_driver *driver);
+extern void ide_pci_setup_ports(struct pci_dev *dev, struct ide_pci_device_s *d, int autodma, int pciirq, ata_index_t *index);
+extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d);
 
 extern void default_hwif_iops(ide_hwif_t *);
 extern void default_hwif_mmiops(ide_hwif_t *);
@@ -1647,6 +1649,7 @@ typedef struct ide_pci_device_s {
 	u16			device;
 	char			*name;
 	void			(*init_setup)(struct pci_dev *, struct ide_pci_device_s *);
+	void			(*init_setup_dma)(struct pci_dev *, struct ide_pci_device_s *, ide_hwif_t *);
 	unsigned int		(*init_chipset)(struct pci_dev *, const char *);
 	void			(*init_iops)(ide_hwif_t *);
 	void                    (*init_hwif)(ide_hwif_t *);
@@ -1657,6 +1660,7 @@ typedef struct ide_pci_device_s {
 	u8			bootable;
 	unsigned int		extra;
 	struct ide_pci_device_s	*next;
+	u8			isa_ports; 	/* Uses ISA control ports not PCI ones */
 } ide_pci_device_t;
 
 extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
@@ -1664,6 +1668,8 @@ extern void ide_setup_pci_devices(struct pci_dev *, struct pci_dev *, ide_pci_de
 
 #define BAD_DMA_DRIVE		0
 #define GOOD_DMA_DRIVE		1
+
+#ifdef CONFIG_BLK_DEV_IDEDMA_PCI
 extern int ide_build_dmatable(ide_drive_t *, struct request *);
 extern void ide_destroy_dmatable(ide_drive_t *);
 extern ide_startstop_t ide_dma_intr(ide_drive_t *);
@@ -1708,6 +1714,10 @@ static inline int __ide_dma_queued_off(ide_drive_t *drive)
 }
 #endif
 
+#else
+static inline void ide_release_dma(ide_hwif_t *) {;}
+#endif
+
 extern void hwif_unregister(ide_hwif_t *);
 
 extern void export_ide_init_queue(ide_drive_t *);
@@ -1730,6 +1740,7 @@ extern u8 ide_rate_filter(u8 mode, u8 speed);
 extern int ide_dma_enable(ide_drive_t *drive);
 extern char *ide_xfer_verbose(u8 xfer_rate);
 extern void ide_toggle_bounce(ide_drive_t *drive, int on);
+extern int ide_set_xfer_rate(ide_drive_t *drive, u8 rate);
 
 extern spinlock_t ide_lock;
 
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index f8890c70fa89..584b9f55b7e3 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -165,6 +165,7 @@
 #define PCI_DEVICE_ID_LSI_53C1010_33	0x0020
 #define PCI_DEVICE_ID_LSI_53C1010_66	0x0021
 #define PCI_DEVICE_ID_LSI_53C1030	0x0030
+#define PCI_DEVICE_ID_LSI_1030_53C1035	0x0032
 #define PCI_DEVICE_ID_LSI_53C1035	0x0040
 #define PCI_DEVICE_ID_NCR_53C875J	0x008f
 #define PCI_DEVICE_ID_LSI_FC909		0x0621
@@ -172,6 +173,8 @@
 #define PCI_DEVICE_ID_LSI_FC929_LAN	0x0623
 #define PCI_DEVICE_ID_LSI_FC919		0x0624
 #define PCI_DEVICE_ID_LSI_FC919_LAN	0x0625
+#define PCI_DEVICE_ID_LSI_FC929X	0x0626
+#define PCI_DEVICE_ID_LSI_FC919X	0x0628
 #define PCI_DEVICE_ID_NCR_YELLOWFIN	0x0701
 #define PCI_DEVICE_ID_LSI_61C102	0x0901
 #define PCI_DEVICE_ID_LSI_63C815	0x1000
@@ -265,6 +268,8 @@
 #define PCI_DEVICE_ID_ATI_RADEON_RB	0x5145
 #define PCI_DEVICE_ID_ATI_RADEON_RC	0x5146
 #define PCI_DEVICE_ID_ATI_RADEON_RD	0x5147
+/* RadeonIGP */
+#define PCI_DEVICE_ID_ATI_RADEON_IGP	0xCAB0
 
 #define PCI_VENDOR_ID_VLSI		0x1004
 #define PCI_DEVICE_ID_VLSI_82C592	0x0005
@@ -456,14 +461,31 @@
 #define PCI_DEVICE_ID_MIRO_36050	0x5601
 
 #define PCI_VENDOR_ID_NEC		0x1033
-#define PCI_DEVICE_ID_NEC_PCX2		0x0046
+#define PCI_DEVICE_ID_NEC_CBUS_1	0x0001 /* PCI-Cbus Bridge */
+#define PCI_DEVICE_ID_NEC_LOCAL		0x0002 /* Local Bridge */
+#define PCI_DEVICE_ID_NEC_ATM		0x0003 /* ATM LAN Controller */
+#define PCI_DEVICE_ID_NEC_R4000		0x0004 /* R4000 Bridge */
+#define PCI_DEVICE_ID_NEC_486		0x0005 /* 486 Like Peripheral Bus Bridge */
+#define PCI_DEVICE_ID_NEC_ACCEL_1	0x0006 /* Graphic Accelerator */
+#define PCI_DEVICE_ID_NEC_UXBUS		0x0007 /* UX-Bus Bridge */
+#define PCI_DEVICE_ID_NEC_ACCEL_2	0x0008 /* Graphic Accelerator */
+#define PCI_DEVICE_ID_NEC_GRAPH		0x0009 /* PCI-CoreGraph Bridge */
+#define PCI_DEVICE_ID_NEC_VL		0x0016 /* PCI-VL Bridge */
+#define PCI_DEVICE_ID_NEC_STARALPHA2	0x002c /* STAR ALPHA2 */
+#define PCI_DEVICE_ID_NEC_CBUS_2	0x002d /* PCI-Cbus Bridge */
+#define PCI_DEVICE_ID_NEC_USB		0x0035 /* PCI-USB Host */
+#define PCI_DEVICE_ID_NEC_CBUS_3	0x003b
+#define PCI_DEVICE_ID_NEC_PCX2		0x0046 /* PowerVR */
 #define PCI_DEVICE_ID_NEC_NILE4		0x005a
 #define PCI_DEVICE_ID_NEC_VRC5476       0x009b
 #define PCI_DEVICE_ID_NEC_VRC5477_AC97  0x00a6
+#define PCI_DEVICE_ID_NEC_PC9821CS01    0x800c /* PC-9821-CS01 */
+#define PCI_DEVICE_ID_NEC_PC9821NRB06   0x800d /* PC-9821NR-B06 */
 
 #define PCI_VENDOR_ID_FD		0x1036
 #define PCI_DEVICE_ID_FD_36C70		0x0000
 
+#define PCI_VENDOR_ID_SIS		0x1039
 #define PCI_VENDOR_ID_SI		0x1039
 #define PCI_DEVICE_ID_SI_5591_AGP	0x0001
 #define PCI_DEVICE_ID_SI_6202		0x0002
@@ -1238,6 +1260,8 @@
 #define PCI_DEVICE_ID_ATT_L56XMF	0x0440
 #define PCI_DEVICE_ID_ATT_VENUS_MODEM	0x480
 
+#define PCI_VENDOR_ID_NEC2		0x11c3 /* NEC (2nd) */
+
 #define PCI_VENDOR_ID_SPECIALIX		0x11cb
 #define PCI_DEVICE_ID_SPECIALIX_IO8	0x2000
 #define PCI_DEVICE_ID_SPECIALIX_XIO	0x4000
@@ -1883,4 +1907,3 @@
 
 #define PCI_VENDOR_ID_HINT		0x3388
 #define PCI_DEVICE_ID_HINT_VXPROII_IDE	0x8013
-
diff --git a/include/linux/serio.h b/include/linux/serio.h
index b0690405229d..2e45f82a554d 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -97,6 +97,7 @@ static __inline__ void serio_cleanup(struct serio *serio)
 #define SERIO_8042	0x01000000UL
 #define SERIO_RS232	0x02000000UL
 #define SERIO_HIL_MLC	0x03000000UL
+#define SERIO_PC9800	0x04000000UL
 
 #define SERIO_PROTO	0xFFUL
 #define SERIO_MSC	0x01
diff --git a/include/linux/soundmodem.h b/include/linux/soundmodem.h
deleted file mode 100644
index 10d0799d6e1c..000000000000
--- a/include/linux/soundmodem.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * The Linux soundcard driver for 1200 baud and 9600 baud packet radio
- * (C) 1996-1998 by Thomas Sailer, HB9JNX/AE4WA
- */
-
-#ifndef _SOUNDMODEM_H
-#define _SOUNDMODEM_H
-
-/* -------------------------------------------------------------------- */
-/*
- * structs for the IOCTL commands
- */
-
-struct sm_debug_data {
-	unsigned int int_rate;
-	unsigned int mod_cycles;
-	unsigned int demod_cycles;
-	unsigned int dma_residue;
-};
-
-struct sm_diag_data {
-	unsigned int mode;
-	unsigned int flags;
-	unsigned int samplesperbit;
-	unsigned int datalen;
-	short *data;
-};
-
-struct sm_mixer_data {
-	unsigned int mixer_type;
-	unsigned int sample_rate;
-	unsigned int bit_rate;
-	unsigned int reg;
-	unsigned int data;
-};
-
-struct sm_config {
-	int hardware;
-	int mode;
-};
-
-struct sm_ioctl {
-	int cmd;
-	union {
-		struct sm_config cfg;
-		struct sm_diag_data diag;	
-		struct sm_mixer_data mix;
-		struct sm_debug_data dbg;
-	} data;
-};
-
-/* -------------------------------------------------------------------- */
-
-/*
- * diagnose modes
- */
-#define SM_DIAGMODE_OFF            0
-#define SM_DIAGMODE_INPUT          1
-#define SM_DIAGMODE_DEMOD          2
-#define SM_DIAGMODE_CONSTELLATION  3
-
-/*
- * diagnose flags
- */
-#define SM_DIAGFLAG_DCDGATE    (1<<0)
-#define SM_DIAGFLAG_VALID      (1<<1)
-
-/*
- * mixer types
- */
-#define SM_MIXER_INVALID       0
-#define SM_MIXER_AD1848        0x10
-#define SM_MIXER_CRYSTAL       0x11
-#define SM_MIXER_CT1335        0x20
-#define SM_MIXER_CT1345        0x21
-#define SM_MIXER_CT1745        0x22
-
-/*
- * ioctl values
- */
-#define SMCTL_DIAGNOSE         0x82
-#define SMCTL_GETMIXER         0x83
-#define SMCTL_SETMIXER         0x84
-#define SMCTL_GETDEBUG         0x85
-
-/* -------------------------------------------------------------------- */
-
-#endif /* _SOUNDMODEM_H */
-
-/* --------------------------------------------------------------------- */