diff options
| author | Tom Rini <[email protected]> | 2024-07-01 13:17:56 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-07-01 15:00:56 -0600 |
| commit | 65fbdab27224ee3943a89496b21862db83c34da2 (patch) | |
| tree | 775a0a54066c2e9a6bbba201676e3d896b5cb0e2 /include/linux | |
| parent | 3f772959501c99fbe5aa0b22a36efe3478d1ae1c (diff) | |
| parent | b4cbd1a257d4027038b4f997d73bdb0a066db045 (diff) | |
Merge branch 'next'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/compat.h | 1 | ||||
| -rw-r--r-- | include/linux/mtd/omap_gpmc.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index f8e3570d1ad..62381451617 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -5,6 +5,7 @@ #include <cyclic.h> #include <log.h> #include <malloc.h> +#include <time.h> #include <asm/processor.h> diff --git a/include/linux/mtd/omap_gpmc.h b/include/linux/mtd/omap_gpmc.h index f08e700a1da..2dbf988863f 100644 --- a/include/linux/mtd/omap_gpmc.h +++ b/include/linux/mtd/omap_gpmc.h @@ -8,6 +8,8 @@ #ifndef __ASM_OMAP_GPMC_H #define __ASM_OMAP_GPMC_H +#include <linux/types.h> + /* Maximum Number of Chip Selects */ #define GPMC_CS_NUM 8 |