• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 356b9542
    Linus Torvalds authored
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (21 commits)
      m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac
      m68k/serial: Remove references to obsolete serial config options
      m68k/net: Remove obsolete IRQ_FLG_* users
      m68k: Don't comment out syscalls used by glibc
      m68k/atari: Move declaration of atari_SCC_reset_done to header file
      m68k/serial: Remove references to obsolete CONFIG_SERIAL167
      m68k/hp300: Export hp300_ledstate
      m68k: Initconst section fixes
      m68k/mac: cleanup macro case
      mac_scsi: fix mac_scsi on some powerbooks
      m68k/mac: fix powerbook 150 adb_type
      m68k/mac: fix baboon irq disable and shutdown
      m68k/mac: oss irq fixes
      m68k/mac: fix nubus slot irq disable and shutdown
      m68k/mac: enable via_alt_mapping on performa 580
      m68k/mac: cleanup forward declarations
      m68k/mac: cleanup mac_irq_pending
      m68k/mac: cleanup mac_clear_irq
      m68k/mac: early console
      m68k/mvme16x: Add support for EARLY_PRINTK
      ...
    
    Fix up trivial conflict in arch/m68k/Kconfig.debug due to new
    EARLY_PRINTK config option addition clashing with movement of the
    BOOTPARAM options.
    356b9542
macsonic.c 18.2 KB