]> git.karo-electronics.de Git - karo-tx-linux.git/commit
fb: fix colliding defines for fb flags.
authorDave Airlie <airlied@redhat.com>
Wed, 23 Jun 2010 01:35:41 +0000 (11:35 +1000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 2 Aug 2010 17:20:46 +0000 (10:20 -0700)
commit9b6961fc8a1350eafe2160ebf86f95053ca6b3c2
tree471a02bb7bb6c073bdd5419d0b09b90285a01300
parent84caca557082c2c4656584b34360d857d7bee1f1
fb: fix colliding defines for fb flags.

commit b26c949755c06ec79e55a75817210083bd78fc9a upstream.

When I added the flags I must have been using a 25 line terminal and missed the following flags.

The collided with flag has one user in staging despite being in-tree for 5 years.

I'm happy to push this via my drm tree unless someone really wants to do it.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
include/linux/fb.h