SOURCES (LINUX_2_6): linux-2.6-ppc-mediabay.patch - up ftom upstream

[arekm]

Author: arekm                        Date: Mon Jun 23 08:19:50 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- up ftom upstream

---- Files affected:
SOURCES:
   linux-2.6-ppc-mediabay.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-ppc-mediabay.patch
diff -u SOURCES/linux-2.6-ppc-mediabay.patch:1.1.2.1 SOURCES/linux-2.6-ppc-mediabay.patch:1.1.2.2
--- SOURCES/linux-2.6-ppc-mediabay.patch:1.1.2.1	Tue Jun 17 10:11:12 2008
+++ SOURCES/linux-2.6-ppc-mediabay.patch	Mon Jun 23 10:19:44 2008
@@ -1,35 +1,27 @@
-From bunk at kernel.org Wed Jun 11 03:47:45 2008
-From: Adrian Bunk <bunk at kernel.org>
-Subject: [2.6 patch] drivers/macintosh/mediabay.c build fix
-Date: Wed, 11 Jun 2008 03:47:45 +1000
-X-Patchwork-ID: 18885
+commit 305c73687157d677bee6f2a5dbee438d844a028c
+Author: Adrian Bunk <bunk at kernel.org>
+Date:   Wed Jun 11 03:47:45 2008 +1000
+
+    [POWERPC] Build fix for drivers/macintosh/mediabay.c
+    
+    This fixes the following build error with CONFIG_BLK_DEV_IDE_PMAC=n:
+    
+    <--  snip  -->
+    
+    ...
+      CC      drivers/macintosh/mediabay.o
+    /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/macintosh/mediabay.c: In function 'check_media_bay':
+    /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/macintosh/mediabay.c:428: error: 'struct media_bay_info' has no member named 'cd_index'
+    make[3]: *** [drivers/macintosh/mediabay.o] Error 1
+    
+    <--  snip  -->
+    
+    Reported-by: Adrian Bunk <bunk at kernel.org>
+    Signed-off-by: Adrian Bunk <bunk at kernel.org>
+    Signed-off-by: Paul Mackerras <paulus at samba.org>
 
-This patch fixes the following build error with CONFIG_BLK_DEV_IDE_PMAC=n:
-
-<--  snip  -->
-
-...
-  CC      drivers/macintosh/mediabay.o
-/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/macintosh/mediabay.c: In function 'check_media_bay':
-/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/macintosh/mediabay.c:428: error: 'struct media_bay_info' has no member named 'cd_index'
-make[3]: *** [drivers/macintosh/mediabay.o] Error 1
-
-<--  snip  -->
-
-Reported-by: Adrian Bunk <bunk at kernel.org>
-Signed-off-by: Adrian Bunk <bunk at kernel.org>
-
----
-
- drivers/macintosh/mediabay.c   |    4 ++--
- include/asm-powerpc/mediabay.h |   12 ++++++++++--
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-e644eb541d73b1fe13550506398d725a536c6aef diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
-index 82add26..7d406ef 100644
-
-
----
+diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
+index c34bdf8..818aba3 100644
 --- a/drivers/macintosh/mediabay.c
 +++ b/drivers/macintosh/mediabay.c
 @@ -84,7 +84,7 @@ struct media_bay_info {
@@ -87,4 +79,3 @@
  #endif
  
  #endif /* __KERNEL__ */
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-ppc-mediabay.patch?r1=1.1.2.1&r2=1.1.2.2&f=u