diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-14 15:07:33 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-14 15:07:33 +0100 |
| commit | b70366e5d31788650b2a5cec5cd13ea80ac7e44a (patch) | |
| tree | d972ffd190111d699200448494fda333d28b2486 /drivers/of/unittest.c | |
| parent | f42e181935d5e5670c87d31ae48063a495bbacae (diff) | |
| parent | db6ccf23e8ba40fc2e8914ec9c0eb950df71d9fe (diff) | |
| download | talos-op-linux-b70366e5d31788650b2a5cec5cd13ea80ac7e44a.tar.gz talos-op-linux-b70366e5d31788650b2a5cec5cd13ea80ac7e44a.zip | |
Merge tag 'doc-4.11-images' of git://git.lwn.net/linux into drm-misc-next
Pointer for Markus's image conversion work.
We need this so we can merge all the pretty drm graphs for 4.12.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/of/unittest.c')
| -rw-r--r-- | drivers/of/unittest.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 53c83d66eb7e..62db55b97c10 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -17,7 +17,6 @@ #include <linux/slab.h> #include <linux/device.h> #include <linux/platform_device.h> -#include <linux/of_platform.h> #include <linux/i2c.h> #include <linux/i2c-mux.h> @@ -1181,7 +1180,7 @@ static void of_unittest_destroy_tracked_overlays(void) } while (defers > 0); } -static int of_unittest_apply_overlay(int unittest_nr, int overlay_nr, +static int of_unittest_apply_overlay(int overlay_nr, int unittest_nr, int *overlay_id) { struct device_node *np = NULL; @@ -1840,7 +1839,7 @@ static void of_unittest_overlay_i2c_15(void) int ret; /* device should enable */ - ret = of_unittest_apply_overlay_check(16, 15, 0, 1, I2C_OVERLAY); + ret = of_unittest_apply_overlay_check(15, 15, 0, 1, I2C_OVERLAY); if (ret != 0) return; |
