diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-01-30 10:57:22 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-01-30 10:57:22 +0300 |
| commit | 1b62d134d3c5f9e67de096af7ea3e9fe48966f17 (patch) | |
| tree | be30467e997cc8ba0d350309dd498f00cb69969b /drivers/media/pci/cx23885/cx23885-input.c | |
| parent | 7a37052adb5e843bcfff6c98aee9b60bb087b910 (diff) | |
| parent | e9ca038a94f5a41c0689c5f441fd9c5a567e6f39 (diff) | |
| download | linux-1b62d134d3c5f9e67de096af7ea3e9fe48966f17.tar.xz | |
Merge back earlier ACPICA changes for v4.11.
Diffstat (limited to 'drivers/media/pci/cx23885/cx23885-input.c')
| -rw-r--r-- | drivers/media/pci/cx23885/cx23885-input.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c index 410c3141c163..1f092febdbd1 100644 --- a/drivers/media/pci/cx23885/cx23885-input.c +++ b/drivers/media/pci/cx23885/cx23885-input.c @@ -30,13 +30,13 @@ * GNU General Public License for more details. */ +#include "cx23885.h" +#include "cx23885-input.h" + #include <linux/slab.h> #include <media/rc-core.h> #include <media/v4l2-subdev.h> -#include "cx23885.h" -#include "cx23885-input.h" - #define MODULE_NAME "cx23885" static void cx23885_input_process_measurements(struct cx23885_dev *dev, |