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

driver due to the Origin A64 hacks.

5 files changed, 21 insertions, 55 deletions

diff --git a/arch/m68k/atari/joystick.c b/arch/m68k/atari/joystick.c
index f8d965498..bf82e67ea 100644
--- a/arch/m68k/atari/joystick.c
+++ b/arch/m68k/atari/joystick.c
@@ -118,16 +118,11 @@ static unsigned int joystick_poll(struct file *file, poll_table *wait)
 }
 
 struct file_operations atari_joystick_fops = {
-	NULL,		/* joystick_seek */
-	read_joystick,
-	write_joystick,
-	NULL,		/* joystick_readdir */
-	joystick_poll,
-	NULL,		/* joystick_ioctl */
-	NULL,		/* joystick_mmap */
-	open_joystick,
-	NULL,		/* flush */
-	release_joystick
+	read:		read_joystick,
+	write:		write_joystick,
+	poll:		joystick_poll,
+	open:		open_joystick,
+	release:	release_joystick,
 };
 
 int __init atari_joystick_init(void)
diff --git a/arch/m68k/bvme6000/rtc.c b/arch/m68k/bvme6000/rtc.c
index 282a2871d..4a244f851 100644
--- a/arch/m68k/bvme6000/rtc.c
+++ b/arch/m68k/bvme6000/rtc.c
@@ -158,16 +158,9 @@ static int rtc_release(struct inode *inode, struct file *file)
  */
 
 static struct file_operations rtc_fops = {
-	NULL,
-	NULL,
-	NULL,		/* No write */
-	NULL,		/* No readdir */
-	NULL,
-	rtc_ioctl,
-	NULL,		/* No mmap */
-	rtc_open,
-	NULL,		/* flush */
-	rtc_release
+	ioctl:		rtc_ioctl,
+	open:		rtc_open,
+	release:	rtc_release,
 };
 
 static struct miscdevice rtc_dev=
diff --git a/arch/m68k/mac/adb-bus.c b/arch/m68k/mac/adb-bus.c
index 850e9cb6f..23e98c048 100644
--- a/arch/m68k/mac/adb-bus.c
+++ b/arch/m68k/mac/adb-bus.c
@@ -2498,16 +2498,11 @@ static int adb_write(struct inode *inode, struct file *file,
 }
 
 static struct file_operations adb_fops = {
-	adb_lseek,
-	adb_read,
-	adb_write,
-	NULL,		/* no readdir */
-	NULL,		/* no poll yet */
-	NULL,		/* no ioctl yet */
-	NULL,		/* no mmap */
-	adb_open,
-	NULL,		/* flush */
-	adb_release
+	llseek:		adb_lseek,
+	read:		adb_read,
+	write:		adb_write,
+	open:		adb_open,
+	release:	adb_release,
 };
 
 int adbdev_register(int subtype, struct file_operations *fops)
@@ -2683,16 +2678,11 @@ static int adb_write(struct inode *inode, struct file *file,
 }
 
 static struct file_operations adb_fops = {
-	adb_lseek,
-	adb_read,
-	adb_write,
-	NULL,		/* no readdir */
-	NULL,		/* no select */
-	NULL,		/* no ioctl */
-	NULL,		/* no mmap */
-	adb_open,
-	NULL,		/* flush */
-	adb_release
+	llseek:		adb_lseek,
+	read:		adb_read,
+	write:		adb_write,
+	open:		adb_open,
+	release:	adb_release,
 };
 
 static struct miscdevice adb_dev = {
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index 5e7741ee1..4e6b28265 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -38,8 +38,6 @@ static unsigned long totalram_pages = 0;
 void mmu_emu_reserve_pages(unsigned long max_page);
 #endif
 
-extern void show_net_buffers(void);
-
 int do_check_pgt_cache(int low, int high)
 {
 	int freed = 0;
@@ -116,9 +114,6 @@ void show_mem(void)
     printk("%d pages swap cached\n",cached);
     printk("%ld pages in page table cache\n",pgtable_cache_size);
     show_buffers();
-#ifdef CONFIG_NET
-    show_net_buffers();
-#endif
 }
 
 extern void init_pointer_table(unsigned long ptable);
diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c
index f5f472132..a47e4c634 100644
--- a/arch/m68k/mvme16x/rtc.c
+++ b/arch/m68k/mvme16x/rtc.c
@@ -147,16 +147,9 @@ static int rtc_release(struct inode *inode, struct file *file)
  */
 
 static struct file_operations rtc_fops = {
-	NULL,
-	NULL,
-	NULL,		/* No write */
-	NULL,		/* No readdir */
-	NULL,
-	rtc_ioctl,
-	NULL,		/* No mmap */
-	rtc_open,
-	NULL,		/* flush */
-	rtc_release
+	ioctl:		rtc_ioctl,
+	open:		rtc_open,
+	release:	rtc_release,
 };
 
 static struct miscdevice rtc_dev=