diff options
| author | Tom Rini <[email protected]> | 2024-05-20 10:16:33 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-05-20 10:16:33 -0600 |
| commit | d4781422d1268aa6deca3e49d2fb227e79c160b4 (patch) | |
| tree | 420073c8a29a401a3908803000df6f54673e1731 /include/linux | |
| parent | 85854bc3324edd0c81047780ee60033d056fd490 (diff) | |
| parent | a7f0154c412859323396111dd0c09dbafbc153cb (diff) | |
Merge tag 'v2024.07-rc3' into next
Prepare v2024.07-rc3
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, 0 insertions, 3 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index 62381451617..f8e3570d1ad 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -5,7 +5,6 @@ #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 2dbf988863f..f08e700a1da 100644 --- a/include/linux/mtd/omap_gpmc.h +++ b/include/linux/mtd/omap_gpmc.h @@ -8,8 +8,6 @@ #ifndef __ASM_OMAP_GPMC_H #define __ASM_OMAP_GPMC_H -#include <linux/types.h> - /* Maximum Number of Chip Selects */ #define GPMC_CS_NUM 8 |