Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab534857 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'exotic-arch-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull "exotic" arch fixes from Geert Uytterhoeven:
 "This is a collection of several exotic architecture fixes, and a few
  other fixes for issues that were detected while doing the former"

* 'exotic-arch-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (35 commits)
  lib: Move fonts from drivers/video/console/ to lib/fonts/
  console/font: Refactor font support code selection logic
  Revert "staging/solo6x10: depend on CONFIG_FONTS"
  input: cros_ec_keyb_clear_keyboard() depends on CONFIG_PM_SLEEP
  score: Wire up asm-generic/xor.h
  score: Remove unneeded <asm/dma-mapping.h>
  openrisc: Wire up asm-generic/xor.h
  h8300/boot: Use POSIX "$((..))" instead of bashism "$[...]"
  h8300: Mark H83002 and H83048 CPU support broken
  h8300: Switch h8300 to drivers/Kconfig
  h8300: Limit timer channel ranges in Kconfig
  h8300: Wire up asm-generic/xor.h
  h8300: Fill the system call table using a CALL() macro
  h8300: Fix <asm/tlb.h>
  h8300: Hardcode symbol prefixes in asm sources
  h8300: add missing definition for read_barries_depends()
  frv: head.S - Remove commented-out initialization code
  cris: Wire up asm-generic/vga.h
  parport: disable PC-style parallel port support on cris
  console: Disable VGA text console support on cris
  ...
parents 0e97456a ee89bd6b

Documentation/DocBook/device-drivers.tmpl

+2 −2
Original line number Original line Diff line number Diff line
@@ -297,10 +297,10 @@ KAO --> 
     </sect1>

     </sect1>

     <sect1><title>Frame Buffer Fonts</title>

     <sect1><title>Frame Buffer Fonts</title>

        <para>

        <para>

           Refer to the file drivers/video/console/fonts.c for more information.

           Refer to the file lib/fonts/fonts.c for more information.

        </para>

        </para>

<!-- FIXME: Removed for now since no structured comments in source

<!-- FIXME: Removed for now since no structured comments in source

X!Idrivers/video/console/fonts.c

X!Ilib/fonts/fonts.c

-->

-->

     </sect1>

     </sect1>

  </chapter>

  </chapter>

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ OBJS += misc.o decompress.o 
ifeq ($(CONFIG_DEBUG_UNCOMPRESS),y)

ifeq ($(CONFIG_DEBUG_UNCOMPRESS),y)

OBJS	+= debug.o

OBJS	+= debug.o

endif

endif

FONTC	= $(srctree)/drivers/video/console/font_acorn_8x8.c

FONTC	= $(srctree)/lib/fonts/font_acorn_8x8.c





# string library code (-Os is enforced to keep it much smaller)

# string library code (-Os is enforced to keep it much smaller)

OBJS		+= string.o

OBJS		+= string.o

arch/avr32/mach-at32ap/at32ap700x.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1060,7 +1060,9 @@ struct platform_device *__init at32_add_device_usart(unsigned int id) 




void __init at32_setup_serial_console(unsigned int usart_id)

void __init at32_setup_serial_console(unsigned int usart_id)

{

{

#ifdef CONFIG_SERIAL_ATMEL

	atmel_default_console_device = at32_usarts[usart_id];

	atmel_default_console_device = at32_usarts[usart_id];

#endif

}

}





/* --------------------------------------------------------------------

/* --------------------------------------------------------------------

arch/c6x/include/asm/Kbuild

+1 −0
Original line number Original line Diff line number Diff line
@@ -55,3 +55,4 @@ generic-y += types.h 
generic-y += ucontext.h

generic-y += ucontext.h

generic-y += user.h

generic-y += user.h

generic-y += vga.h

generic-y += vga.h

generic-y += xor.h

arch/cris/Kconfig

+1 −31
Original line number Original line Diff line number Diff line
@@ -637,40 +637,10 @@ endchoice 




endmenu

endmenu





source "drivers/base/Kconfig"

source "drivers/Kconfig"



# standard linux drivers

source "drivers/mtd/Kconfig"



source "drivers/parport/Kconfig"



source "drivers/pnp/Kconfig"



source "drivers/block/Kconfig"



source "drivers/ide/Kconfig"



source "drivers/net/Kconfig"



source "drivers/i2c/Kconfig"



source "drivers/rtc/Kconfig"



#

# input before char - char/joystick depends on it. As does USB.

#

source "drivers/input/Kconfig"



source "drivers/char/Kconfig"





source "fs/Kconfig"

source "fs/Kconfig"





source "drivers/usb/Kconfig"



source "drivers/uwb/Kconfig"



source "drivers/staging/Kconfig"



source "arch/cris/Kconfig.debug"

source "arch/cris/Kconfig.debug"





source "security/Kconfig"

source "security/Kconfig"