r2026 - trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches

[Andres Salomon]

Author: dilinger-guest
Date: 2004-12-23 01:39:26 -0700 (Thu, 23 Dec 2004)
New Revision: 2026

Added:
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/fb_get_option-fix.dpatch
Removed:
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/fb_get_option-fix.diff
Log:
rename fb_get_option-fix patch


Deleted: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/fb_get_option-fix.diff
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/fb_get_option-fix.diff	2004-12-23 08:38:47 UTC (rev 2025)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/fb_get_option-fix.diff	2004-12-23 08:39:26 UTC (rev 2026)
@@ -1,57 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: fix bw2/cyber2000fb compile
-## DP: Patch author: Antonino Daplas <adaplas@pol.net>
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-#   2004/10/19 08:09:41-07:00 adaplas@hotpop.com 
-#   [PATCH] fbdev: trivial fb_get_options fix for cyber2000fb and bw2fb
-#   
-#   Trivial fb_get_options fix for
-#   - cyber200fb
-#   - bw2fb
-#   
-#   Signed-off-by: Antonino Daplas <adaplas@pol.net>
-#   Signed-off-by: Andrew Morton <akpm@osdl.org>
-#   Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-# 
-# drivers/video/bw2.c
-#   2004/10/19 02:40:23-07:00 adaplas@hotpop.com +1 -1
-#   fbdev: trivial fb_get_options fix for cyber2000fb and bw2fb
-# 
-# drivers/video/cyber2000fb.c
-#   2004/10/19 02:40:23-07:00 adaplas@hotpop.com +1 -1
-#   fbdev: trivial fb_get_options fix for cyber2000fb and bw2fb
-# 
-diff -Nru a/drivers/video/bw2.c b/drivers/video/bw2.c
---- a/drivers/video/bw2.c	2004-11-27 16:05:09 -08:00
-+++ b/drivers/video/bw2.c	2004-11-27 16:05:09 -08:00
-@@ -386,7 +386,7 @@
- 	struct sbus_bus *sbus;
- 	struct sbus_dev *sdev;
- 
--	if (fb_get_options("bw2fb", &option))
-+	if (fb_get_options("bw2fb", NULL))
- 		return -ENODEV;
- 
- #ifdef CONFIG_SUN4
-diff -Nru a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
---- a/drivers/video/cyber2000fb.c	2004-11-27 16:05:09 -08:00
-+++ b/drivers/video/cyber2000fb.c	2004-11-27 16:05:09 -08:00
-@@ -1724,7 +1724,7 @@
- #ifndef MODULE
- 	char *option = NULL;
- 
--	if (fb_get_options("cyber2000fb", NULL))
-+	if (fb_get_options("cyber2000fb", &option))
- 		return -ENODEV;
- 	cyber2000fb_setup(option);
- #endif

Copied: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/fb_get_option-fix.dpatch (from rev 2025, trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/fb_get_option-fix.diff)