diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-26 08:02:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-26 08:02:51 +0100 |
| commit | 032371a1e673275202c047537726f4216d7dbf0b (patch) | |
| tree | 6617c73b795f51f1e86a6cdb79fadb7ed5d69829 /drivers | |
| parent | 2e6e902d185027f8e3cb8b7305238f7e35d6a436 (diff) | |
| parent | d20810530b7109a95abef5130e6dcec09c5180d7 (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/fsi/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/fsi/fsi-scom.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/fsi/Kconfig b/drivers/fsi/Kconfig index af3a20dd5aa4..99c99a5d57fe 100644 --- a/drivers/fsi/Kconfig +++ b/drivers/fsi/Kconfig @@ -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 diff --git a/drivers/fsi/fsi-scom.c b/drivers/fsi/fsi-scom.c index df94021dd9d1..81dc01ac2351 100644 --- a/drivers/fsi/fsi-scom.c +++ b/drivers/fsi/fsi-scom.c @@ -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> |