Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c

driver due to the Origin A64 hacks.

1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/char/ip2main.c b/drivers/char/ip2main.c
index c5f31d1eb..95e2d2ed0 100644
--- a/drivers/char/ip2main.c
+++ b/drivers/char/ip2main.c
@@ -185,16 +185,11 @@ static struct termios    * TermiosLocked[IP2_MAX_PORTS];
 /* This is the driver descriptor for the ip2ipl device, which is used to
  * download the loadware to the boards.
  */
-static struct file_operations
-ip2_ipl = {
-	NULL,
-	ip2_ipl_read,
-	ip2_ipl_write,
-	NULL,
-	NULL,
-	ip2_ipl_ioctl,
-	NULL,
-	ip2_ipl_open,
+static struct file_operations ip2_ipl = {
+	read:		ip2_ipl_read,
+	write:		ip2_ipl_write,
+	ioctl:		ip2_ipl_ioctl,
+	open:		ip2_ipl_open,
 }; 
 
 static long irq_counter = 0;