diff options
| author | Dave Stevenson | 2018-05-10 21:42:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-05-11 12:02:05 +0200 |
| commit | 84adcb14133ed2412d54355539a8ab4d6a3fcabc (patch) | |
| tree | 5eb0f3a8ae4e3592d4ce7b4eb5adf1ba3a493273 /drivers/staging/vc04_services | |
| parent | staging: bcm2835-camera: Add multiple include protection (diff) | |
| download | kernel-qcow2-linux-84adcb14133ed2412d54355539a8ab4d6a3fcabc.tar.gz kernel-qcow2-linux-84adcb14133ed2412d54355539a8ab4d6a3fcabc.tar.xz kernel-qcow2-linux-84adcb14133ed2412d54355539a8ab4d6a3fcabc.zip | |
staging: bcm2835-camera: Move struct vchiq_mmal_rect
struct vchiq_mmal_rect is only referenced from mmal-parameters.h, yet
was defined in mmal-vchiq.h.
Move it to avoid having to include multiple headers for no reason.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vc04_services')
| -rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h | 8 | ||||
| -rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h index 3dc50593a665..184024dfb8b7 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h @@ -564,6 +564,14 @@ enum mmal_parameter_displayset { MMAL_DISPLAY_SET_ALPHA = 0x400, }; +/* rectangle, used lots so it gets its own struct */ +struct vchiq_mmal_rect { + s32 x; + s32 y; + s32 width; + s32 height; +}; + struct mmal_parameter_displayregion { /** Bitfield that indicates which fields are set and should be * used. All other fields will maintain their current value. diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h index 0ab9f660b822..22b839ecd5f0 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h @@ -32,14 +32,6 @@ enum vchiq_mmal_es_type { MMAL_ES_TYPE_SUBPICTURE /**< Sub-picture elementary stream */ }; -/* rectangle, used lots so it gets its own struct */ -struct vchiq_mmal_rect { - s32 x; - s32 y; - s32 width; - s32 height; -}; - struct vchiq_mmal_port_buffer { unsigned int num; /* number of buffers */ u32 size; /* size of buffers */ |