diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-08 08:26:36 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-08 08:26:36 +0100 |
| commit | 79606b51ed58819bd71bc6ca7d1a41185f83c89c (patch) | |
| tree | ac057d11a56341df849761c9f08e6e8be353e3aa /drivers | |
| parent | 05261801e9cde103b3c4df843472027c007531da (diff) | |
| parent | f0c29241001e44f6d29b757be9c7efeed6b0b2fe (diff) | |
| download | barebox-79606b51ed58819bd71bc6ca7d1a41185f83c89c.tar.gz barebox-79606b51ed58819bd71bc6ca7d1a41185f83c89c.tar.xz | |
Merge branch 'for-next/linux-headers'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/mtdconcat.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/denali.h | 1 | ||||
| -rw-r--r-- | drivers/usb/gadget/f_acm.c | 1 | ||||
| -rw-r--r-- | drivers/usb/musb/musb_core.h | 1 | ||||
| -rw-r--r-- | drivers/usb/musb/phy-am335x-control.c | 1 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/imx-ipu-v3.h | 2 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/ipu-common.c | 1 |
7 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c index 837614fdc5..6395b2fd52 100644 --- a/drivers/mtd/mtdconcat.c +++ b/drivers/mtd/mtdconcat.c @@ -23,6 +23,7 @@ */ #include <common.h> #include <malloc.h> +#include <linux/wait.h> #include <linux/mtd/mtd.h> #include <linux/mtd/concat.h> diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h index f5511c969c..515353e277 100644 --- a/drivers/mtd/nand/denali.h +++ b/drivers/mtd/nand/denali.h @@ -21,6 +21,7 @@ #define __DENALI_H__ #include <linux/mtd/nand.h> +#include <linux/spinlock.h> #define DEVICE_RESET 0x0 #define DEVICE_RESET__BANK0 0x0001 diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c index f582fcd0c5..cba59b1585 100644 --- a/drivers/usb/gadget/f_acm.c +++ b/drivers/usb/gadget/f_acm.c @@ -17,6 +17,7 @@ #include <common.h> #include <usb/cdc.h> #include <linux/err.h> +#include <linux/spinlock.h> #include <asm/byteorder.h> #include <usb/composite.h> diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index 46265d6190..a21ddd5df2 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h @@ -39,6 +39,7 @@ #include <notifier.h> #include <usb/usb.h> #include <usb/phy.h> +#include <linux/spinlock.h> struct musb; struct musb_hw_ep; diff --git a/drivers/usb/musb/phy-am335x-control.c b/drivers/usb/musb/phy-am335x-control.c index 214ae71776..809c5182c0 100644 --- a/drivers/usb/musb/phy-am335x-control.c +++ b/drivers/usb/musb/phy-am335x-control.c @@ -2,6 +2,7 @@ #include <init.h> #include <io.h> #include <linux/err.h> +#include <linux/spinlock.h> struct phy_control { void (*phy_power)(struct phy_control *phy_ctrl, u32 id, bool on); diff --git a/drivers/video/imx-ipu-v3/imx-ipu-v3.h b/drivers/video/imx-ipu-v3/imx-ipu-v3.h index 783535ea54..fbfec22e4f 100644 --- a/drivers/video/imx-ipu-v3/imx-ipu-v3.h +++ b/drivers/video/imx-ipu-v3/imx-ipu-v3.h @@ -16,6 +16,8 @@ #include <fb.h> #include <video/vpl.h> #include <video/fourcc.h> +#include <linux/mutex.h> +#include <linux/spinlock.h> struct ipu_soc; diff --git a/drivers/video/imx-ipu-v3/ipu-common.c b/drivers/video/imx-ipu-v3/ipu-common.c index cd63f04475..70bb0e59b6 100644 --- a/drivers/video/imx-ipu-v3/ipu-common.c +++ b/drivers/video/imx-ipu-v3/ipu-common.c @@ -19,6 +19,7 @@ #include <clock.h> #include <driver.h> #include <init.h> +#include <linux/mutex.h> #include <mach/generic.h> #include <mach/imx6-regs.h> #include <mach/imx53-regs.h> |