diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-18 23:56:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-18 23:56:57 +0100 |
| commit | 3542f6b1836d8940615104e22248bb9b7cf54f5f (patch) | |
| tree | 6808fae6dfb12bb4b7e5e0df4efbe3e0dae8c537 /arch/blackfin/mach-bf533/boards/stamp.c | |
| parent | pcmcia: add missing include for new pci resource handler (diff) | |
| parent | Linux 3.19-rc5 (diff) | |
| download | linux-3542f6b1836d8940615104e22248bb9b7cf54f5f.tar.xz linux-3542f6b1836d8940615104e22248bb9b7cf54f5f.zip | |
Merge 3.19-rc5 into char-misc-next
We want the 3.19-rc5 fixes in here for our testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/blackfin/mach-bf533/boards/stamp.c')
| -rw-r--r-- | arch/blackfin/mach-bf533/boards/stamp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c index 6f4bac969bf7..23eada79439c 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c @@ -7,6 +7,7 @@ */ #include <linux/device.h> +#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> |