Merge m68k patches

diff --cc arch/m68k/bvme6000/config.c
Simple merge

diff --cc arch/m68k/mvme147/config.c
Simple merge

diff --cc arch/m68k/mvme16x/config.c
Simple merge

diff --cc drivers/block/acsi.c
index f616f01847b742fe04eb89f87774c9fce0d5c6bc,b57caf387a3e98707a28db448a967dd80ac2cb33..48c250892cde98fe27ed362612fc906eb04032d8
--- 1/drivers/block/acsi.c
--- 2/drivers/block/acsi.c
+++ b/drivers/block/acsi.c
@@@ -1810,17 -1828,26 +1812,17 @@@ void cleanup_module(void
   *
   */
  
- static int revalidate_acsidisk( int dev, int maxusage )
+ static int revalidate_acsidisk(kdev_t dev, int maxusage )
  {
 -      int device;
 -      struct gendisk * gdev;
 -      int res;
 -      struct acsi_info_struct *aip;
 -      
 -      device = minor(dev);
 -      aip = &acsi_info[device];
 -      gdev = &GENDISK_STRUCT;
 +      int unit = DEVICE_NR(minor(dev));
 +      struct acsi_info_struct *aip = &acsi_info[unit];
 +      kdev_t device = mk_kdev(MAJOR_NR, unit<<4);
 +      int res = dev_lock_part(device);
  
 -      cli();
 -      if (DEVICE_BUSY || USAGE > maxusage) {
 -              sti();
 -              return -EBUSY;
 -      };
 -      DEVICE_BUSY = 1;
 -      sti();
 +      if (res < 0)
 +              return res;
  
 -      res = wipe_partitions(dev);
 +      res = wipe_partitions(device);
  
        stdma_lock( NULL, NULL );
  

diff --cc drivers/block/ataflop.c
Simple merge

diff --cc drivers/block/floppy.c
Simple merge

diff --cc drivers/char/Makefile
index 650d9b6eb6de4f29f8ecf71c9763dd2f56cb2dde,be51439f49bd085231f9b7f81ac1f1a23cb7413a..d7044c9b2b06ac8c1d823a1ec4f022bee7d6f3d8
--- 1/drivers/char/Makefile
--- 2/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@@ -45,8 -48,18 +45,17 @@@ ifeq ($(ARCH),m68k
     else
        KEYBD =
     endif
 -   SERIAL   =
  endif
  
+ ifdef CONFIG_Q40
+   KEYBD += q40_keyb.o
+   SERIAL = serial.o
+ endif
+ 
+ ifdef CONFIG_APOLLO
+   KEYBD += dn_keyb.o
+ endif
+ 
  ifeq ($(ARCH),arm)
    ifneq ($(CONFIG_PC_KEYMAP),y)
      KEYMAP   =

diff --cc include/asm-m68k/system.h
Simple merge