[kernel] r5035 - in dists/trunk/linux-2.6/debian: . arch arch/alpha
arch/amd64 arch/arm arch/hppa arch/i386 arch/ia64 arch/m68k
arch/powerpc arch/sparc patches-debian patches-debian/series
Frederik Schüler
fschueler-guest at costa.debian.org
Mon Dec 19 07:38:46 UTC 2005
Author: fschueler-guest
Date: Mon Dec 19 07:38:42 2005
New Revision: 5035
Added:
dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc5-0experimental.2
Modified:
dists/trunk/linux-2.6/debian/arch/alpha/config
dists/trunk/linux-2.6/debian/arch/amd64/config
dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
dists/trunk/linux-2.6/debian/arch/arm/config.rpc
dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
dists/trunk/linux-2.6/debian/arch/config
dists/trunk/linux-2.6/debian/arch/hppa/config
dists/trunk/linux-2.6/debian/arch/i386/config
dists/trunk/linux-2.6/debian/arch/ia64/config
dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
dists/trunk/linux-2.6/debian/arch/m68k/config.atari
dists/trunk/linux-2.6/debian/arch/m68k/config.mac
dists/trunk/linux-2.6/debian/arch/m68k/config.q40
dists/trunk/linux-2.6/debian/arch/powerpc/config
dists/trunk/linux-2.6/debian/arch/powerpc/config.apus
dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64
dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches-debian/drivers-scsi-megaraid_splitup.patch
Log:
- Add updated version of drivers-scsi-megaraid_splitup.patch.
- Deactivate CONFIG_IDE_TASK_IOCTL on alpha and ia64 and make it a global option.
Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config (original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config Mon Dec 19 07:38:42 2005
@@ -208,9 +208,7 @@
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEFLOPPY=m
-CONFIG_IDE_TASK_IOCTL=y
CONFIG_IDE_GENERIC=m
-# CONFIG_BLK_DEV_IDEPNP is not set
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config (original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config Mon Dec 19 07:38:42 2005
@@ -255,7 +255,6 @@
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEFLOPPY=m
-# CONFIG_IDE_TASK_IOCTL is not set
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_CMD640=y
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge Mon Dec 19 07:38:42 2005
@@ -426,13 +426,11 @@
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
#
# IDE chipset support/bugfixes
#
CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_IDEPNP=m
# CONFIG_BLK_DEV_IDEPCI is not set
# CONFIG_IDE_ARM is not set
# CONFIG_IDE_CHIPSETS is not set
Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx Mon Dec 19 07:38:42 2005
@@ -593,7 +593,6 @@
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
#
# IDE chipset support/bugfixes
Modified: dists/trunk/linux-2.6/debian/arch/arm/config.rpc
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.rpc (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.rpc Mon Dec 19 07:38:42 2005
@@ -333,7 +333,6 @@
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
#
# IDE chipset support/bugfixes
Modified: dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410 (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410 Mon Dec 19 07:38:42 2005
@@ -440,7 +440,6 @@
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEFLOPPY=m
# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
#
# IDE chipset support/bugfixes
Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config (original)
+++ dists/trunk/linux-2.6/debian/arch/config Mon Dec 19 07:38:42 2005
@@ -739,3 +739,4 @@
# CONFIG_USB_MIDI is not set
CONFIG_OBSOLETE_OSS_USB_DRIVER=y
CONFIG_ATM_DUMMY=m
+# CONFIG_IDE_TASK_IOCTL is not set
Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config (original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config Mon Dec 19 07:38:42 2005
@@ -125,7 +125,6 @@
CONFIG_BLK_DEV_IDECD=m
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_IDE_TASK_IOCTL is not set
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config Mon Dec 19 07:38:42 2005
@@ -316,7 +316,6 @@
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEFLOPPY=m
-# CONFIG_IDE_TASK_IOCTL is not set
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_CMD640=y
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config (original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config Mon Dec 19 07:38:42 2005
@@ -219,7 +219,6 @@
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEFLOPPY=m
-CONFIG_IDE_TASK_IOCTL=y
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.amiga (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.amiga Mon Dec 19 07:38:42 2005
@@ -42,7 +42,6 @@
CONFIG_BLK_DEV_IDECD=y
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEFLOPPY=m
-# CONFIG_IDE_TASK_IOCTL is not set
CONFIG_IDE_GENERIC=y
# CONFIG_IDE_ARM is not set
CONFIG_BLK_DEV_GAYLE=y
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.atari
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.atari (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.atari Mon Dec 19 07:38:42 2005
@@ -34,7 +34,6 @@
CONFIG_BLK_DEV_IDECD=y
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEFLOPPY=m
-# CONFIG_IDE_TASK_IOCTL is not set
CONFIG_IDE_GENERIC=y
# CONFIG_IDE_ARM is not set
CONFIG_BLK_DEV_FALCON_IDE=y
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mac
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mac (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mac Mon Dec 19 07:38:42 2005
@@ -28,7 +28,6 @@
CONFIG_BLK_DEV_IDECD=y
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEFLOPPY=m
-# CONFIG_IDE_TASK_IOCTL is not set
CONFIG_IDE_GENERIC=y
# CONFIG_IDE_ARM is not set
CONFIG_BLK_DEV_MAC_IDE=y
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.q40
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.q40 (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.q40 Mon Dec 19 07:38:42 2005
@@ -30,7 +30,6 @@
CONFIG_BLK_DEV_IDECD=y
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEFLOPPY=m
-# CONFIG_IDE_TASK_IOCTL is not set
CONFIG_IDE_GENERIC=y
# CONFIG_IDE_ARM is not set
CONFIG_BLK_DEV_Q40IDE=y
Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config (original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config Mon Dec 19 07:38:42 2005
@@ -141,7 +141,6 @@
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEFLOPPY=m
-# CONFIG_IDE_TASK_IOCTL is not set
# CONFIG_IDE_GENERIC is not set
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.apus
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.apus (original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.apus Mon Dec 19 07:38:42 2005
@@ -247,7 +247,6 @@
CONFIG_BLK_DEV_IDECD=y
# CONFIG_BLK_DEV_IDETAPE is not set
CONFIG_BLK_DEV_IDEFLOPPY=y
-# CONFIG_IDE_TASK_IOCTL is not set
#
# IDE chipset support/bugfixes
Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64 (original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64 Mon Dec 19 07:38:42 2005
@@ -66,7 +66,6 @@
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEFLOPPY=m
-# CONFIG_IDE_TASK_IOCTL is not set
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_IDEPCI=y
# CONFIG_IDEPCI_SHARE_IRQ is not set
Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp (original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp Mon Dec 19 07:38:42 2005
@@ -70,7 +70,6 @@
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEFLOPPY=m
-# CONFIG_IDE_TASK_IOCTL is not set
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_IDEPCI=y
# CONFIG_IDEPCI_SHARE_IRQ is not set
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Mon Dec 19 07:38:42 2005
@@ -15,7 +15,13 @@
* Adjust short description of transitional package kernel-image-2.6-
486 to mention 2.6 (not 2.6.12).
- -- Jonas Smedegaard <dr at jones.dk> Sat, 17 Dec 2005 17:40:09 +0100
+ [ Frederik Schüler ]
+ * Add updated version of drivers-scsi-megaraid_splitup.patch.
+ (Closes: #317258)
+ * Deactivate CONFIG_IDE_TASK_IOCTL on alpha and ia64 and make it a global
+ option.
+
+ -- Frederik Schüler <fs at debian.org> Mon, 19 Dec 2005 01:10:37 +0100
linux-2.6 (2.6.14+2.6.15-rc5-0experimental.1) experimental; urgency=low
Modified: dists/trunk/linux-2.6/debian/patches-debian/drivers-scsi-megaraid_splitup.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/drivers-scsi-megaraid_splitup.patch (original)
+++ dists/trunk/linux-2.6/debian/patches-debian/drivers-scsi-megaraid_splitup.patch Mon Dec 19 07:38:42 2005
@@ -1,25 +1,30 @@
-# From Fabio M. Di Nitto <fabbione at ubuntu.com>
-# Date 27th May 2005
-# Source Ubuntu kernel-team baz-archive
-# http://people.u.c/~lamont/Archives/kernel-team@ubuntu.com--2005/
-# kernel-debian--pre1,2--2.6.11.93
-#
-# * The megaraid legacy driver is around only to support AMI megaraid 1 and 2.
-# All the other controllers are supported (according to the code) by the
-# new megaraid driver:
-# - Add patch drivers-scsi-megaraid_spiltup.dpatch:
-# . Split PCI ID's properly between the 2 drivers.
-# . Allow compilation of both drivers at the same time.
-# . Update Kconfig.megaraid to reflect the new changes in the help.
-# . Rename a few things in the old megaraid driver to avoid possible
-# conflicts with the new drivers (NOTE: there might be more that needs
-# to be changed given that now the 2 modules can be loaded at the same
-# time).
+# drivers-scsi-megaraid_splitup.patch by Frederik Schüler <fs at debian.org>
+# Patch author: Ben Collins <bcollins at ubuntu.com>
+# Upstream status: not submitted
+# Description: Support megaraid legacy and megraid newgen, side-by-side
+# Source: ubuntu-2.6 git
+# diff from ca0e9390e01be69893d78bf9576d63ec85a6965e to 03bba4e0c091909e36520f2e617e51e87e50f8cd
+# diff from e82633eb19c4b390846a6eecd72204b696448954 to 8378e9887b6cf0b99e28a3b71c585bd1279932f7
-diff -urNad linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid/Kconfig.megaraid /usr/src/dpatchtemp/dpep.eRg2wK/linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid/Kconfig.megaraid
---- linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid/Kconfig.megaraid 2005-03-02 08:37:49.000000000 +0100
-+++ /usr/src/dpatchtemp/dpep.eRg2wK/linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid/Kconfig.megaraid 2005-04-19 08:28:09.521239400 +0200
-@@ -64,15 +64,11 @@
+diff --git a/drivers/scsi/megaraid/Kconfig.megaraid b/drivers/scsi/megaraid/Kconfig.megaraid
+index 7363e12..d71a230 100644
+--- a/drivers/scsi/megaraid/Kconfig.megaraid
++++ b/drivers/scsi/megaraid/Kconfig.megaraid
+@@ -1,12 +1,6 @@
+-config MEGARAID_NEWGEN
+- bool "LSI Logic New Generation RAID Device Drivers"
+- depends on PCI && SCSI
+- help
+- LSI Logic RAID Device Drivers
+-
+ config MEGARAID_MM
+ tristate "LSI Logic Management Module (New Driver)"
+- depends on PCI && SCSI && MEGARAID_NEWGEN
++ depends on PCI && SCSI
+ help
+ Management Module provides ioctl, sysfs support for LSI Logic
+ RAID controllers.
+@@ -64,18 +58,15 @@ config MEGARAID_MAILBOX
To compile this driver as a module, choose M here: the
module will be called megaraid_mbox
@@ -31,15 +36,33 @@
- This driver supports the LSI MegaRAID 418, 428, 438, 466, 762, 490
- and 467 SCSI host adapters. This driver also support the all U320
- RAID controllers
-+ This driver supports the AMI MEGARAID 1 and 2.
++ This driver supports the AMI MEGARAID 1 and 2, and the HP NETRAID
++ 1 and 2
To compile this driver as a module, choose M here: the
module will be called megaraid
-endif
-diff -urNad linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid.c /usr/src/dpatchtemp/dpep.eRg2wK/linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid.c
---- linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid.c 2005-03-02 08:37:30.000000000 +0100
-+++ /usr/src/dpatchtemp/dpep.eRg2wK/linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid.c 2005-04-19 08:35:13.889725584 +0200
-@@ -4565,7 +4565,7 @@
+
+ config MEGARAID_SAS
+ tristate "LSI Logic MegaRAID SAS RAID Module"
+diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
+index 4facf55..59cdd2a 100644
+--- a/drivers/scsi/megaraid.h
++++ b/drivers/scsi/megaraid.h
+@@ -84,6 +84,10 @@
+ #define LSI_SUBSYS_VID 0x1000
+ #define INTEL_SUBSYS_VID 0x8086
+
++/* Sub-System Device IDs */
++#define HP_NETRAID1M_SUBSYS_DID 0x60E7
++#define HP_NETRAID2M_SUBSYS_DID 0x60E8
++
+ #define HBA_SIGNATURE 0x3344
+ #define HBA_SIGNATURE_471 0xCCCC
+ #define HBA_SIGNATURE_64BIT 0x0299
+--- a/drivers/scsi/megaraid.c
++++ b/drivers/scsi/megaraid.c
+@@ -4570,7 +4570,7 @@
};
static int __devinit
@@ -48,35 +71,43 @@
{
struct Scsi_Host *host;
adapter_t *adapter;
-@@ -5033,35 +5033,23 @@
+@@ -5036,36 +5036,28 @@
+ __megaraid_shutdown(adapter);
}
- static struct pci_device_id megaraid_pci_tbl[] = {
+-static struct pci_device_id megaraid_pci_tbl[] = {
- {PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DISCOVERY,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_PERC4_DI,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, BOARD_64BIT},
- {PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_PERC4_QC_VERDE,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, BOARD_64BIT},
++static struct pci_device_id megaraid_legacy_pci_tbl[] = {
{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID2,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-- {PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID3,
+ {PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID3,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_AMI_MEGARAID3,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_AMI_MEGARAID3,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
++ HP_SUBSYS_VID, HP_NETRAID1M_SUBSYS_DID, 0, 0, 0},
++ {PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID3,
++ HP_SUBSYS_VID, HP_NETRAID2M_SUBSYS_DID, 0, 0, 0},
{0,}
};
- MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl);
+-MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl);
++MODULE_DEVICE_TABLE(pci, megaraid_legacy_pci_tbl);
- static struct pci_driver megaraid_pci_driver = {
+-static struct pci_driver megaraid_pci_driver = {
- .name = "megaraid",
-+ .name = "megaraidlegacy",
- .id_table = megaraid_pci_tbl,
+- .id_table = megaraid_pci_tbl,
- .probe = megaraid_probe_one,
++static struct pci_driver megaraid_legacy_pci_driver = {
++ .name = "megaraidlegacy",
++ .id_table = megaraid_legacy_pci_tbl,
+ .probe = megaraid_legacy_probe_one,
.remove = __devexit_p(megaraid_remove_one),
.shutdown = megaraid_shutdown,
@@ -87,7 +118,16 @@
{
int error;
-@@ -5102,7 +5090,7 @@
+@@ -5081,7 +5073,7 @@
+ "megaraid: failed to create megaraid root\n");
+ }
+ #endif
+- error = pci_module_init(&megaraid_pci_driver);
++ error = pci_module_init(&megaraid_legacy_pci_driver);
+ if (error) {
+ #ifdef CONFIG_PROC_FS
+ remove_proc_entry("megaraid", &proc_root);
+@@ -5104,21 +5096,21 @@
return 0;
}
@@ -96,7 +136,14 @@
{
/*
* Unregister the character device interface to the driver.
-@@ -5116,7 +5104,7 @@
+ */
+ unregister_chrdev(major, "megadev");
+
+- pci_unregister_driver(&megaraid_pci_driver);
++ pci_unregister_driver(&megaraid_legacy_pci_driver);
+
+ #ifdef CONFIG_PROC_FS
+ remove_proc_entry("megaraid", &proc_root);
#endif
}
Added: dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc5-0experimental.2
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc5-0experimental.2 Mon Dec 19 07:38:42 2005
@@ -0,0 +1 @@
++ drivers-scsi-megaraid_splitup.patch
More information about the Kernel-svn-changes
mailing list