r3023 - trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches

[maximilian attems]

Author: maks-guest
Date: 2005-05-06 16:31:46 +0000 (Fri, 06 May 2005)
New Revision: 3023

Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/patch-2.6.11.8.patch
Log:
back out the zero partition type check for msdos


Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/patch-2.6.11.8.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/patch-2.6.11.8.patch	2005-05-05 09:50:37 UTC (rev 3022)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/patch-2.6.11.8.patch	2005-05-06 16:31:46 UTC (rev 3023)
@@ -190,28 +190,6 @@
  	/* tuner configuration (from card list / autodetect / insmod option) */
   	if (UNSET != bttv_tvcards[btv->c.type].tuner_type)
  		if(UNSET == btv->tuner_type)
-diff -Nru a/fs/partitions/msdos.c b/fs/partitions/msdos.c
---- a/fs/partitions/msdos.c	2005-04-29 18:34:37 -07:00
-+++ b/fs/partitions/msdos.c	2005-04-29 18:34:37 -07:00
-@@ -114,6 +114,9 @@
- 		 */
- 		for (i=0; i<4; i++, p++) {
- 			u32 offs, size, next;
-+
-+			if (SYS_IND(p) == 0)
-+				continue;
- 			if (!NR_SECTS(p) || is_extended_partition(p))
- 				continue;
- 
-@@ -430,6 +433,8 @@
- 	for (slot = 1 ; slot <= 4 ; slot++, p++) {
- 		u32 start = START_SECT(p)*sector_size;
- 		u32 size = NR_SECTS(p)*sector_size;
-+		if (SYS_IND(p) == 0)
-+			continue;
- 		if (!size)
- 			continue;
- 		if (is_extended_partition(p)) {
 diff -Nru a/security/keys/key.c b/security/keys/key.c
 --- a/security/keys/key.c	2005-04-29 18:34:37 -07:00
 +++ b/security/keys/key.c	2005-04-29 18:34:37 -07:00