Minor fixes

-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJb+y2KAAoJEHM62YSLdExemvQP/jyItukyGZxrQkxzJ/V4m1U1
 QRti2+d7RxtJPj4pT/61KrLOnuRQ4Gs6HQ8ggbXLBHzk3gQ/eezatv7TkUpHBxeV
 aI/3S0apwKfN8LA4ra9BmRwfmzHrGgoRf71PmKx0kwF1XcKhRw4z98SwxO/QfUNI
 MaMN8C8P5PUXNKv+bcwI4v6IUkg1XOxdqI41aPF+NnUkN0J/w95N0bxCc77F6YMa
 OokkshphJY71NrYk79vsFgMVUis2kSLZ6aqgitwLGxKVnFVRCsrakYiZ8HslW39P
 FYpFhXnkSiUe95l9gCW+zXEQIjSq4MqlDZAY/MRlsbV2A4b5q22VZa+RZ+prqNPG
 xPxrrHjKfdY55aqw4O5UsqoQBohUskgIIu3A9OscCveSHH4cQDwzdPONnPLd/7pQ
 SN85oOooofo+zUHNhL817uGbawOkJXO+BUS+ckfZ8YC+u2+erWuFVJmUZLpxYgwQ
 tC5IT6SCjcSl0MZw7CLu/uOZ0Ha7+nZC2Ff4tCJ50isVEkBH12Wrufy0Rp2BEprm
 EEYFQVFWMEa5w75SnQguULPGuTw8j0CpWdylvOSxgZV1NYbuVYpfV4w7qIpUXnGO
 oRv1fgRFdnP0+LtwCL4a/OfIF5r9zL2d28BLeTMuxsioRFl8W8bNQaYO6fIFKhY6
 d5iyBOzwAUDRatKTcdnu
 =lwXP
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Greg Kroah-Hartman 2018-11-26 08:02:51 +01:00
commit 032371a1e6
2 changed files with 1 additions and 1 deletions

View File

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

View File

@ -20,7 +20,6 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/cdev.h>
#include <linux/list.h> #include <linux/list.h>
#include <uapi/linux/fsi.h> #include <uapi/linux/fsi.h>