diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:54:11 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:54:11 +0100 |
| commit | 9b1d12fff0650706eb3c335d31bd378b5d873cb2 (patch) | |
| tree | 360c6a3a1d2e9aeca0463f1ec4e49e1a3dcd0b8e /drivers | |
| parent | 3eade89c7573f8893fe045290e374d4502092e13 (diff) | |
| parent | 3bfd83d0f1fb3cedef7c803ad7f5cee78ca3415d (diff) | |
| download | barebox-9b1d12fff0650706eb3c335d31bd378b5d873cb2.tar.gz barebox-9b1d12fff0650706eb3c335d31bd378b5d873cb2.tar.xz | |
Merge branch 'for-next/randconfig'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/gpio-clps711x.c | 2 | ||||
| -rw-r--r-- | drivers/net/fec_imx.c | 6 | ||||
| -rw-r--r-- | drivers/usb/gadget/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/video/Kconfig | 1 |
4 files changed, 4 insertions, 10 deletions
diff --git a/drivers/gpio/gpio-clps711x.c b/drivers/gpio/gpio-clps711x.c index 7d3f1ffb25..43268b6bbf 100644 --- a/drivers/gpio/gpio-clps711x.c +++ b/drivers/gpio/gpio-clps711x.c @@ -10,7 +10,7 @@ #include <init.h> #include <common.h> #include <malloc.h> - +#include <linux/err.h> #include <linux/basic_mmio_gpio.h> static int clps711x_gpio_probe(struct device_d *dev) diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index a2852ed7af..c1fa1517da 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -32,12 +32,6 @@ #include <asm/mmu.h> -#include <mach/generic.h> -#include <mach/clock.h> -#ifndef CONFIG_ARCH_MXS -# include <mach/iim.h> -#endif - #include "fec_imx.h" struct fec_frame { diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index d75f54e67f..5d9158ffae 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -1,5 +1,6 @@ menuconfig USB_GADGET select USB + select POLLER bool "USB gadget support" if USB_GADGET @@ -13,7 +14,6 @@ config USB_GADGET_DRIVER_ARC depends on ARCH_IMX || ARCH_MXS default y select USB_GADGET_DUALSPEED - select POLLER config USB_GADGET_DRIVER_AT91 bool @@ -21,7 +21,6 @@ config USB_GADGET_DRIVER_AT91 depends on ARCH_AT91 default y select USB_GADGET_DUALSPEED - select POLLER config USB_GADGET_DRIVER_PXA27X bool @@ -29,7 +28,6 @@ config USB_GADGET_DRIVER_PXA27X depends on ARCH_PXA default y select USB_GADGET_DUALSPEED - select POLLER comment "USB Gadget drivers" @@ -46,6 +44,7 @@ config USB_GADGET_SERIAL config USB_GADGET_FASTBOOT bool select BANNER + depends on COMMAND_SUPPORT prompt "Android Fastboot support" endif diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 34177b3f08..f096a5456b 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -87,6 +87,7 @@ config DRIVER_VIDEO_SIMPLEFB based on the active barebox framebuffer. config DRIVER_VIDEO_EDID + depends on I2C bool "Add EDID support" help This enabled support for reading and parsing EDID data from an attached |