diff options
| author | Tom Rini <[email protected]> | 2023-11-07 18:33:09 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-11-07 18:33:09 -0500 |
| commit | 1e4d9dd871512e1955e45ac1c3095fb063c0d07c (patch) | |
| tree | 3770d9ca70d5f8447a25bdabe03c7c60f4fd29aa /include/linux | |
| parent | 3af0e9556c968fc2c40e3778d8f1e668a90af92e (diff) | |
| parent | d7f592da6ee90b11cea4d2ad4d0f39d6d26fc3b6 (diff) | |
Merge branch '2023-11-07-assorted-big-cleanups' into next
- Merge in changes such that CONFIG_CMDLINE can be disabled and merge
in a series that starts to remove <common.h> usage.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mii.h | 2 | ||||
| -rw-r--r-- | include/linux/mtd/spinand.h | 1 | ||||
| -rw-r--r-- | include/linux/usb/composite.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mii.h b/include/linux/mii.h index 49e29ac314a..70689bc53d7 100644 --- a/include/linux/mii.h +++ b/include/linux/mii.h @@ -9,6 +9,8 @@ #ifndef __LINUX_MII_H__ #define __LINUX_MII_H__ +#include <linux/types.h> + /* Generic MII registers. */ #define MII_BMCR 0x00 /* Basic mode control register */ #define MII_BMSR 0x01 /* Basic mode status register */ diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h index e8d6feb9705..6d68514e07a 100644 --- a/include/linux/mtd/spinand.h +++ b/include/linux/mtd/spinand.h @@ -17,7 +17,6 @@ #include <linux/spi/spi.h> #include <linux/spi/spi-mem.h> #else -#include <common.h> #include <spi.h> #include <spi-mem.h> #include <linux/mtd/nand.h> diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index 935e5c0cbb1..bb1eb93bd20 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -21,7 +21,6 @@ * the composite model the host can use both functions at the same time. */ -#include <common.h> #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/bitmap.h> |