[Linux-mips-commits]CVS: linux/include/linux ac97_codec.h,1.5,1.6 mc146818rtc.h,1.1.1.1,1.2 netdevice.h,1.4,1.5

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv5739/include/linux

Modified Files:
	ac97_codec.h mc146818rtc.h netdevice.h 
Log Message:
Sync with OSS 2.4.9.



Index: ac97_codec.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/linux/ac97_codec.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ac97_codec.h	2001/08/29 22:30:58	1.5
+++ ac97_codec.h	2001/09/25 03:36:36	1.6
@@ -185,8 +185,7 @@
 	int dev_mixer; 
 	int type;
 
-	/* codec specific init/reset routines, used mainly for 4 or 6 channel support */
-	int  (*codec_init)  (struct ac97_codec *codec);
+	struct ac97_ops *codec_ops;
 
 	/* controller specific lower leverl ac97 accessing routines */
 	u16  (*codec_read)  (struct ac97_codec *codec, u8 reg);
@@ -215,6 +214,20 @@
 
 	/* Software Modem interface */
 	int  (*modem_ioctl)(struct ac97_codec *codec, unsigned int cmd, unsigned long arg);
+};
+
+/*
+ *	Operation structures for each known AC97 chip
+ */
+ 
+struct ac97_ops
+{
+	/* Initialise */
+	int (*init)(struct ac97_codec *c);
+	/* Amplifier control */
+	int (*amplifier)(struct ac97_codec *codec, int on);
+	/* Digital mode control */
+	int (*digital)(struct ac97_codec *codec, int format);
 };
 
 extern int ac97_read_proc (char *page_out, char **start, off_t off,

Index: mc146818rtc.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/linux/mc146818rtc.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- mc146818rtc.h	2001/06/22 02:29:32	1.1.1.1
+++ mc146818rtc.h	2001/09/25 03:36:36	1.2
@@ -13,7 +13,7 @@
 
 #include <asm/io.h>
 #include <linux/rtc.h>			/* get the user-level API */
-#include <linux/spinlock.h>
+#include <linux/spinlock.h>		/* spinlock_t */
 #include <asm/mc146818rtc.h>		/* register access macros */
 
 extern spinlock_t rtc_lock;		/* serialize CMOS RAM access */

Index: netdevice.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/linux/netdevice.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- netdevice.h	2001/08/25 06:24:46	1.4
+++ netdevice.h	2001/09/25 03:36:36	1.5
@@ -349,7 +349,7 @@
 #define NETIF_F_HW_CSUM		8	/* Can checksum all the packets. */
 #define NETIF_F_DYNALLOC	16	/* Self-dectructable device. */
 #define NETIF_F_HIGHDMA		32	/* Can DMA to high memory. */
-#define NETIF_F_FRAGLIST	1	/* Scatter/gather IO. */
+#define NETIF_F_FRAGLIST	64	/* Scatter/gather IO. */
 
 	/* Called after device is detached from network. */
 	void			(*uninit)(struct net_device *dev);