diff options
| author | Stefano Babic <sbabic@denx.de> | 2016-05-17 17:51:44 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2016-05-17 17:51:44 +0200 |
| commit | 52b1eaf93d6b55e1467f97b8eefdc2f8b6031c43 (patch) | |
| tree | 73357539a8382b406c29b1826dc17012f267f2cb /include/linux | |
| parent | aaeadd3f7b248aeb1c72c36183ab9c6e77da6ce2 (diff) | |
| parent | aeaec0e682f45b9e0c62c522fafea353931f73ed (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fb.h | 4 | ||||
| -rw-r--r-- | include/linux/mtd/omap_gpmc.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index 652cf3bab7..fcf331b79f 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -388,14 +388,14 @@ struct fb_cursor_user { #define FB_EVENT_GET_CONSOLE_MAP 0x07 /* CONSOLE-SPECIFIC: set console to framebuffer mapping */ #define FB_EVENT_SET_CONSOLE_MAP 0x08 -/* A hardware display blank change occured */ +/* A hardware display blank change occurred */ #define FB_EVENT_BLANK 0x09 /* Private modelist is to be replaced */ #define FB_EVENT_NEW_MODELIST 0x0A /* The resolution of the passed in fb_info about to change and all vc's should be changed */ #define FB_EVENT_MODE_CHANGE_ALL 0x0B -/* A software display blank change occured */ +/* A software display blank change occurred */ #define FB_EVENT_CONBLANK 0x0C /* Get drawing requirements */ #define FB_EVENT_GET_REQ 0x0D diff --git a/include/linux/mtd/omap_gpmc.h b/include/linux/mtd/omap_gpmc.h index 6cbae45022..3a75674359 100644 --- a/include/linux/mtd/omap_gpmc.h +++ b/include/linux/mtd/omap_gpmc.h @@ -2,7 +2,7 @@ * (C) Copyright 2004-2008 Texas Instruments, <www.ti.com> * Rohit Choraria <rohitkc@ti.com> * - * (C) Copyright 2013 Andreas Bießmann <andreas.devel@googlemail.com> + * (C) Copyright 2013 Andreas Bießmann <andreas@biessmann.org> * * SPDX-License-Identifier: GPL-2.0+ */ |