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

Merge tag 'fbdev-for-7.0-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev 

Pull more fbdev updates from Helge Deller:
 "Code cleanups for the au1100fb fbdev driver (Uwe Kleine-König)"

* tag 'fbdev-for-7.0-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
  fbdev: au1100fb: Replace license boilerplate by SPDX header
  fbdev: au1100fb: Fold au1100fb.h into its only user
  fbdev: au1100fb: Replace custom printk wrappers by pr_*
  fbdev: au1100fb: Make driver compilable on non-mips platforms
  fbdev: au1100fb: Use proper conversion specifiers in printk formats
  fbdev: au1100fb: Mark several local functions as static
  fbdev: au1100fb: Don't store device specific data in global variables
parents 68010e7b 0f967cb8

drivers/video/fbdev/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -1345,7 +1345,8 @@ endchoice 


config FB_AU1100

	bool "Au1100 LCD Driver"

	depends on (FB = y) && MIPS_ALCHEMY

	depends on FB = y

	depends on MIPS_ALCHEMY || COMPILE_TEST

	select FB_IOMEM_HELPERS

	help

	  This is the framebuffer driver for the AMD Au1100 SOC.  It can drive

drivers/video/fbdev/au1100fb.c

+404 −83

File changed.

Preview size limit exceeded, changes collapsed.

drivers/video/fbdev/au1100fb.h

deleted100644 → 0
+0 −379

File deleted.

Preview size limit exceeded, changes collapsed.