Skip to contentSkip to conversation

fbdev fixes for 3.4

GIT PULL Florian Tobias Schandinat 1 participant 1 message Apr 13, 2012 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

Hi Linus,

please pull the fixes below. The fix for kyrofb is a bit large but it's just replacing "unsigned long" by "u32" for 64 bit compatibility.

Thanks,

Florian Tobias Schandinat

The following changes since commit 0034102808e0dbbf3a2394b82b1bb40b5778de9e:

Linux 3.4-rc2 (2012-04-07 18:30:41 -0700)

are available in the git repository at:

git://github.com/schandinat/linux-2.6.git fbdev-fixes-for-3.4-1

for you to fetch changes up to b78f29ca0516266431688c5eb42d39ce42ec039a:

video:uvesafb: Fix oops that uvesafb try to execute NX-protected page
(2012-04-09 16:05:57 +0000)

----------------------------------------------------------------
fbdev fixes for 3.4

It includes:
- a compile fix for au1*fb
- a fix to make kyrofb usable on x86_64
- a fix for uvesafb to prevent an oops due to NX-protection

----------------------------------------------------------------
Manuel Lauss (1):
fbdev: fix au1*fb builds

Ondrej Zary (1):

      kyrofb: fix on x86_64

Wang YanQing (1):
video:uvesafb: Fix oops that uvesafb try to execute NX-protected page

 drivers/video/au1100fb.c        |    5 +-
 drivers/video/au1200fb.c        |    2 +-
 drivers/video/kyro/STG4000Reg.h |  376 +++++++++++++++++++-------------------
 drivers/video/uvesafb.c         |   11 +-
 4 files changed, 201 insertions(+), 193 deletions(-)