summaryrefslogtreecommitdiff
path: root/packages/busybox/busybox-1.3.1/fbset.patch
diff options
context:
space:
mode:
authorOyvind Repvik <nail@nslu2-linux.org>2007-01-15 16:53:35 +0000
committerOyvind Repvik <nail@nslu2-linux.org>2007-01-15 16:53:35 +0000
commit547d37e3dc0dd43dc86d45ab2490dc622b0c386d (patch)
tree08b521e74f9c72665f68f70e95aae1f72e6fb3ca /packages/busybox/busybox-1.3.1/fbset.patch
parentf00b2ecc4057866b860837d4ff8f4e76f3b9e15e (diff)
busybox: Upstream upgrade to 1.3.1, DEFAULT_PREFERENCE=-1
Diffstat (limited to 'packages/busybox/busybox-1.3.1/fbset.patch')
-rw-r--r--packages/busybox/busybox-1.3.1/fbset.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/packages/busybox/busybox-1.3.1/fbset.patch b/packages/busybox/busybox-1.3.1/fbset.patch
new file mode 100644
index 0000000000..d0609ce6f7
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/fbset.patch
@@ -0,0 +1,24 @@
+--- busybox/util-linux/fbset.c~ 2004-07-03 16:24:23.000000000 +0100
++++ busybox/util-linux/fbset.c 2004-12-30 20:09:26.000000000 +0000
+@@ -337,7 +337,7 @@
+ {
+ struct fb_var_screeninfo var, varset;
+ int fh, i;
+- char *fbdev = DEFAULTFBDEV;
++ char *fbdev = NULL;
+ char *modefile = DEFAULTFBMODE;
+ char *thisarg, *mode = NULL;
+
+@@ -404,7 +404,12 @@
+ }
+ }
+
++ if (fbdev == NULL)
++ fbdev = DEFAULTFBDEV;
+ if ((fh = open(fbdev, O_RDONLY)) < 0)
++#ifdef CONFIG_FEATURE_DEVFS
++ if ((fh = open("/dev/fb0", O_RDONLY)) < 0)
++#endif
+ bb_perror_msg_and_die("fbset(open)");
+ if (ioctl(fh, FBIOGET_VSCREENINFO, &var))
+ bb_perror_msg_and_die("fbset(ioctl)");