r1049 - trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches

[Simon Horman]

Author: horms
Date: 2004-08-12 18:33:58 -0600 (Thu, 12 Aug 2004)
New Revision: 1049

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
Log:
Device Mapper: Removed suprious whitespace in comment patch. Removed suprious patch to NBD. Thanks to jkwan

Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6	2004-08-13 00:27:20 UTC (rev 1048)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6	2004-08-13 00:33:58 UTC (rev 1049)
@@ -4829,14 +4829,6 @@
  COMPATIBLE_IOCTL(DRM_IOCTL_GET_MAGIC)
 --- kernel-source-2.4.26-2.4.26/arch/ppc64/kernel/ioctl32.c	2004-08-12 14:04:28.000000000 +0900
 +++ kernel-source-2.4.26-2.4.26.devmap/arch/ppc64/kernel/ioctl32.c	2004-08-12 13:44:38.000000000 +0900
-@@ -4408,7 +4408,6 @@
- COMPATIBLE_IOCTL(NBD_CLEAR_QUE),
- COMPATIBLE_IOCTL(NBD_PRINT_DEBUG),
- COMPATIBLE_IOCTL(NBD_SET_SIZE_BLOCKS),
--COMPATIBLE_IOCTL(NBD_DISCONNECT),
- /* device-mapper */
- #if defined(CONFIG_BLK_DEV_DM) || defined(CONFIG_BLK_DEV_DM_MODULE)
- COMPATIBLE_IOCTL(DM_VERSION),
 @@ -4424,6 +4423,7 @@
  COMPATIBLE_IOCTL(DM_DEV_WAIT),
  COMPATIBLE_IOCTL(DM_LIST_DEVICES),
@@ -4857,15 +4849,6 @@
  	IOCTL32_DEFAULT(LOOP_CLR_FD),
 --- kernel-source-2.4.26-2.4.26/arch/sparc64/kernel/ioctl32.c	2004-08-12 14:04:28.000000000 +0900
 +++ kernel-source-2.4.26-2.4.26.devmap/arch/sparc64/kernel/ioctl32.c	2004-08-12 13:41:02.000000000 +0900
-@@ -5126,7 +5126,7 @@
- COMPATIBLE_IOCTL(NBD_PRINT_DEBUG)
- COMPATIBLE_IOCTL(NBD_SET_SIZE_BLOCKS)
- COMPATIBLE_IOCTL(NBD_DISCONNECT)
--/* device-mapper */
-++/* device-mapper */
- #if defined(CONFIG_BLK_DEV_DM) || defined(CONFIG_BLK_DEV_DM_MODULE)
- COMPATIBLE_IOCTL(DM_VERSION)
- COMPATIBLE_IOCTL(DM_REMOVE_ALL)
 @@ -5141,6 +5141,7 @@
  COMPATIBLE_IOCTL(DM_DEV_WAIT)
  COMPATIBLE_IOCTL(DM_LIST_DEVICES)