diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2026-08-13 08:11:08 +0200 |
|---|---|---|
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2026-08-13 08:11:08 +0200 |
| commit | 42311aa29e20fdc0157746143c108b08b268f5cb (patch) | |
| tree | a7fcbac318f0bce17faf3edf705efcf58375a8be /include/linux/pnp.h | |
| parent | 121f9fd1c3083312055126205f3e40b8ee999fe6 (diff) | |
| parent | 04a19b35dc05354445f0096befad63af885bb77e (diff) | |
| download | linux-next-42311aa29e20fdc0157746143c108b08b268f5cb.tar.gz linux-next-42311aa29e20fdc0157746143c108b08b268f5cb.zip | |
Merge branch 'dma-mapping-coco' into dma-mapping-for-next
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'include/linux/pnp.h')
| -rw-r--r-- | include/linux/pnp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pnp.h b/include/linux/pnp.h index 23fe3eaf242d..e0c0d17eb7d8 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h @@ -12,7 +12,7 @@ #include <linux/device.h> #include <linux/list.h> #include <linux/errno.h> -#include <linux/mod_devicetable.h> +#include <linux/device-id/pnp.h> #include <linux/console.h> #define PNP_NAME_LEN 50 |