Commit 032371a1 authored Nov 26, 2018 by Greg Kroah-Hartman

Merge tag 'fsi-updates-2018-11-26' of...

Merge tag 'fsi-updates-2018-11-26' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/linux-fsi char-misc-linus

Ben writes:
  "Here are two very minor fixes for FSI. One from Arnd is a Kconfig
   fixup and has been rusting away in my tree for a while (I had
   forgotten about it). The other one just removes a duplicate #include,
   courtesy of Brajeswar Ghosh."

* tag 'fsi-updates-2018-11-26' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/linux-fsi:
  fsi: fsi-scom.c: Remove duplicate header
  fsi: master-ast-cf: select GENERIC_ALLOCATOR

parents 2e6e902d d2081053

drivers/fsi/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ config FSI_MASTER_AST_CF
		tristate "FSI master based on Aspeed ColdFire coprocessor"
		depends on GPIOLIB
		depends on GPIO_ASPEED
		select GENERIC_ALLOCATOR
		---help---
		This option enables a FSI master using the AST2400 and AST2500 GPIO
		lines driven by the internal ColdFire coprocessor. This requires

drivers/fsi/fsi-scom.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@
		#include <linux/fs.h>
		#include <linux/uaccess.h>
		#include <linux/slab.h>
		#include <linux/cdev.h>
		#include <linux/list.h>

		#include <uapi/linux/fsi.h>

Admin message