patch-2.1.110 linux/include/linux/parport.h

Next file: linux/include/linux/pci.h
Previous file: linux/include/linux/netdevice.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.109/linux/include/linux/parport.h linux/include/linux/parport.h
@@ -127,14 +127,16 @@
 
 	void (*inc_use_count)(void);
 	void (*dec_use_count)(void);
+	void (*fill_inode)(struct inode *inode, int fill);
 };
 
 struct parport_device_info {
 	parport_device_class class;
-	char *mfr;
-	char *model;
-	char *cmdset;
-	char *description;
+	const char *class_name;
+	const char *mfr;
+	const char *model;
+	const char *cmdset;
+	const char *description;
 };
 
 /* Each device can have two callback functions:
@@ -151,7 +153,7 @@
 
 /* A parallel port device */
 struct pardevice {
-	char *name;
+	const char *name;
 	struct parport *port;
 	int (*preempt)(void *);
 	void (*wakeup)(void *);
@@ -183,7 +185,7 @@
 struct parport {
 	unsigned long base;	/* base address */
 	unsigned int size;	/* IO extent */
-	char *name;
+	const char *name;
 	int irq;		/* interrupt (or -1 for none) */
 	int dma;
 	unsigned int modes;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov