diff options
| author |   Rodrigo Vivi <rodrigo.vivi@intel.com> | 2022-01-31 13:19:33 -0500 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2022-01-31 13:19:33 -0500 |
| commit | 063565aca3734de4e73639a0e460a58d9418b3cd (patch) | |
| tree | fb2455b984f584a819defe6e5fe512a4b6fc33ae /drivers/comedi/drivers/ke_counter.c | |
| parent | drm/i915: Move drrs hardware bit frobbing to small helpers (diff) | |
| parent | Linux 5.17-rc2 (diff) | |
| download | linux-dev-063565aca3734de4e73639a0e460a58d9418b3cd.tar.xz linux-dev-063565aca3734de4e73639a0e460a58d9418b3cd.zip | |
Merge drm/drm-next into drm-intel-next
Catch-up with 5.17-rc2 and trying to align with drm-intel-gt-next
for a possible topic branch for merging the split of i915_regs...
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/comedi/drivers/ke_counter.c')
| -rw-r--r-- | drivers/comedi/drivers/ke_counter.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/comedi/drivers/ke_counter.c b/drivers/comedi/drivers/ke_counter.c index bef1b20c1c8d..b825cf60e1e0 100644 --- a/drivers/comedi/drivers/ke_counter.c +++ b/drivers/comedi/drivers/ke_counter.c @@ -19,8 +19,7 @@ */ #include <linux/module.h> - -#include "../comedi_pci.h" +#include <linux/comedi/comedi_pci.h> /* * PCI BAR 0 Register I/O map |