diff options
| author | Tom Rini | 2024-05-18 20:20:43 -0600 |
|---|---|---|
| committer | Tom Rini | 2024-05-19 08:16:36 -0600 |
| commit | d678a59d2d719da9e807495b4b021501f2836ca5 (patch) | |
| tree | 313e5c32e3d02d3cf1904875b1655140973126e9 /include/linux | |
| parent | 3be9f399e911cfc437a37ac826441f1d96da1c9b (diff) | |
Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.
This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing
changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
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 |