summaryrefslogtreecommitdiff
path: root/security/smack/smack_netfilter.c
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2015-04-17 19:12:41 +0200
committerDave Airlie <airlied@redhat.com>2015-04-20 11:23:56 +1000
commitcec32a47010647e8b0603726ebb75b990a4057a4 (patch)
tree9565a0d5603112874e2dd61e77e615a5b1bf2188 /security/smack/smack_netfilter.c
parentaa219a0dd7774e2454a5687e7d38e947a131cdee (diff)
media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus formatHEADmaster
Change the constant values for RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus formats in anticipation of a merge conflict with the media tree, where the old values are already taken by RBG888_1X24, RGB888_1X32_PADHI, and VUY8_1X24, respectively. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'security/smack/smack_netfilter.c')
0 files changed, 0 insertions, 0 deletions