lkml.org 
[lkml]   [2013]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 266/272] cris: media platform drivers: fix build
    Date
    3.11.10.1 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Mauro Carvalho Chehab <m.chehab@samsung.com>

    commit 72a0c5571351f5184195754d23db3e14495b2080 upstream.

    On cris arch, the functions below aren't defined:

    drivers/media/platform/sh_veu.c: In function 'sh_veu_reg_read':

    drivers/media/platform/sh_veu.c:228:2: error: implicit declaration of function 'ioread32' [-Werror=implicit-function-declaration]
    drivers/media/platform/sh_veu.c: In function 'sh_veu_reg_write':

    drivers/media/platform/sh_veu.c:234:2: error: implicit declaration of function 'iowrite32' [-Werror=implicit-function-declaration]
    drivers/media/platform/vsp1/vsp1.h: In function 'vsp1_read':
    drivers/media/platform/vsp1/vsp1.h:66:2: error: implicit declaration of function 'ioread32' [-Werror=implicit-function-declaration]
    drivers/media/platform/vsp1/vsp1.h: In function 'vsp1_write':
    drivers/media/platform/vsp1/vsp1.h:71:2: error: implicit declaration of function 'iowrite32' [-Werror=implicit-function-declaration]
    drivers/media/platform/vsp1/vsp1.h: In function 'vsp1_read':
    drivers/media/platform/vsp1/vsp1.h:66:2: error: implicit declaration of function 'ioread32' [-Werror=implicit-function-declaration]
    drivers/media/platform/vsp1/vsp1.h: In function 'vsp1_write':
    drivers/media/platform/vsp1/vsp1.h:71:2: error: implicit declaration of function 'iowrite32' [-Werror=implicit-function-declaration]
    drivers/media/platform/soc_camera/rcar_vin.c: In function 'rcar_vin_setup':
    drivers/media/platform/soc_camera/rcar_vin.c:284:3: error: implicit declaration of function 'iowrite32' [-Werror=implicit-function-declaration]

    drivers/media/platform/soc_camera/rcar_vin.c: In function 'rcar_vin_request_capture_stop':
    drivers/media/platform/soc_camera/rcar_vin.c:353:2: error: implicit declaration of function 'ioread32' [-Werror=implicit-function-declaration]

    Yet, they're available, as CONFIG_GENERIC_IOMAP is defined. What happens
    is that asm/io.h was not including asm-generic/iomap.h.

    Suggested-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
    Cc: Mikael Starvik <starvik@axis.com>
    Cc: Jesper Nilsson <jesper.nilsson@axis.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    arch/cris/include/asm/io.h | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/arch/cris/include/asm/io.h b/arch/cris/include/asm/io.h
    index 5d3047e..4353cf2 100644
    --- a/arch/cris/include/asm/io.h
    +++ b/arch/cris/include/asm/io.h
    @@ -3,6 +3,7 @@

    #include <asm/page.h> /* for __va, __pa */
    #include <arch/io.h>
    +#include <asm-generic/iomap.h>
    #include <linux/kernel.h>

    struct cris_io_operations
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-12-06 15:01    [W:4.064 / U:1.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site