diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-26 13:30:41 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-26 13:30:41 -0700 |
| commit | 67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40 (patch) | |
| tree | f12706b80194f48aad3a1bd70ae9215d48875591 /include/linux/blkdev.h | |
| parent | 516fb7a22a5347dc6db731369c365ed1f9b64632 (diff) | |
| parent | c533f32e1ac440b8840159f89ece8c9cca2422b5 (diff) | |
| download | lwn-67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40.tar.gz lwn-67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40.zip | |
Merge branch 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux into late/soc
A few device tree updates and an include file fix for versatile.
* 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux:
ARM: vexpress: Remove twice included header files
ARM: vexpress: Device Tree updates
+ update to 3.4
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 2aa24664a5b5..4d4ac24a263e 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1,9 +1,10 @@ #ifndef _LINUX_BLKDEV_H #define _LINUX_BLKDEV_H +#include <linux/sched.h> + #ifdef CONFIG_BLOCK -#include <linux/sched.h> #include <linux/major.h> #include <linux/genhd.h> #include <linux/list.h> |