r2660 - trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches
maximilian attems
maks-guest@costa.debian.org
Tue, 08 Mar 2005 23:29:57 +0100
Author: maks-guest
Date: 2005-03-08 23:29:57 +0100 (Tue, 08 Mar 2005)
New Revision: 2660
Modified:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-ide-__devinit.dpatch
Log:
not perfect yet, left for takers
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-ide-__devinit.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-ide-__devinit.dpatch 2005-03-08 21:52:38 UTC (rev 2659)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-ide-__devinit.dpatch 2005-03-08 22:29:57 UTC (rev 2660)
@@ -9,20 +9,9 @@
. $(dirname $0)/DPATCH
@DPATCH@
---- 1.4/drivers/ide/pci/adma100.c 2003-02-18 19:06:19 +01:00
-+++ edited/drivers/ide/pci/adma100.c 2004-06-16 15:44:16 +02:00
-@@ -16,7 +16,7 @@
- #include <linux/pci.h>
- #include <asm/io.h>
-
--void __init ide_init_adma100 (ide_hwif_t *hwif)
-+void __devinit ide_init_adma100 (ide_hwif_t *hwif)
- {
- unsigned long phy_admctl = pci_resource_start(hwif->pci_dev, 4) + 0x80 + (hwif->channel * 0x20);
- void *v_admctl;
--- 1.25/drivers/ide/pci/alim15x3.c 2004-06-15 18:29:40 +02:00
+++ edited/drivers/ide/pci/alim15x3.c 2004-06-16 15:45:33 +02:00
-@@ -581,7 +581,7 @@
+@@ -583,7 +583,7 @@
* appropriate also sets up the 1533 southbridge.
*/
@@ -31,7 +20,7 @@
{
unsigned long flags;
u8 tmpbyte;
-@@ -675,7 +675,7 @@
+@@ -677,7 +677,7 @@
* FIXME: frobs bits that are not defined on newer ALi devicea
*/
@@ -40,7 +29,7 @@
{
struct pci_dev *dev = hwif->pci_dev;
unsigned int ata66 = 0;
-@@ -746,7 +746,7 @@
+@@ -748,7 +748,7 @@
* Initialize the IDE structure side of the ALi 15x3 driver.
*/
@@ -49,7 +38,7 @@
{
hwif->autodma = 0;
hwif->tuneproc = &ali15x3_tune_drive;
-@@ -792,7 +792,7 @@
+@@ -794,7 +794,7 @@
* Sparc systems
*/
@@ -58,7 +47,7 @@
{
u8 ideic, inmir;
s8 irq_routing_table[] = { -1, 9, 3, 10, 4, 5, 7, 6,
-@@ -844,7 +844,7 @@
+@@ -847,7 +847,7 @@
* the actual work.
*/
@@ -69,7 +58,7 @@
return;
--- 1.31/drivers/ide/pci/amd74xx.c 2004-06-01 19:55:04 +02:00
+++ edited/drivers/ide/pci/amd74xx.c 2004-06-16 15:44:16 +02:00
-@@ -312,7 +312,7 @@
+@@ -308,7 +308,7 @@
* and initialize its drive independent registers.
*/
@@ -78,7 +67,7 @@
{
unsigned char t;
unsigned int u;
-@@ -416,7 +416,7 @@
+@@ -412,7 +412,7 @@
return dev->irq;
}
@@ -89,7 +78,7 @@
--- 1.9/drivers/ide/pci/cmd640.c 2004-02-01 19:06:55 +01:00
+++ edited/drivers/ide/pci/cmd640.c 2004-06-16 15:44:17 +02:00
-@@ -276,7 +276,7 @@
+@@ -278,7 +278,7 @@
spin_unlock_irqrestore(&ide_lock, flags);
}
@@ -98,7 +87,7 @@
{
const u8 ven_dev[4] = {0x95, 0x10, 0x40, 0x06};
unsigned int i;
-@@ -296,7 +296,7 @@
+@@ -298,7 +298,7 @@
/*
* Probe for CMD640x -- pci method 1
*/
@@ -107,7 +96,7 @@
{
__get_cmd640_reg = get_cmd640_reg_pci1;
__put_cmd640_reg = put_cmd640_reg_pci1;
-@@ -312,7 +312,7 @@
+@@ -314,7 +314,7 @@
/*
* Probe for CMD640x -- pci method 2
*/
@@ -116,7 +105,7 @@
{
__get_cmd640_reg = get_cmd640_reg_pci2;
__put_cmd640_reg = put_cmd640_reg_pci2;
-@@ -326,7 +326,7 @@
+@@ -328,7 +328,7 @@
/*
* Probe for CMD640x -- vlb
*/
@@ -125,7 +114,7 @@
{
u8 b;
-@@ -347,7 +347,7 @@
+@@ -349,7 +349,7 @@
* Returns 1 if an IDE interface/drive exists at 0x170,
* Returns 0 otherwise.
*/
@@ -134,7 +123,7 @@
{
unsigned long flags;
-@@ -390,7 +390,7 @@
+@@ -392,7 +392,7 @@
* Check whether prefetch is on for a drive,
* and initialize the unmask flags for safe operation.
*/
@@ -143,7 +132,7 @@
{
ide_drive_t *drive = cmd_drives[index];
u8 b = get_cmd640_reg(prefetch_regs[index]);
-@@ -411,7 +411,7 @@
+@@ -413,7 +413,7 @@
/*
* Figure out which devices we control
*/
@@ -152,7 +141,7 @@
{
unsigned int i;
-@@ -493,7 +493,7 @@
+@@ -495,7 +495,7 @@
/*
* This routine retrieves the initial drive timings from the chipset.
*/
@@ -161,7 +150,7 @@
{
u8 b;
-@@ -714,7 +714,7 @@
+@@ -716,7 +716,7 @@
/*
* Probe for a cmd640 chipset, and initialize it if found. Called from ide.c
*/
@@ -172,7 +161,7 @@
int second_port_toggled = 0;
--- 1.22/drivers/ide/pci/cs5530.c 2004-06-15 18:29:40 +02:00
+++ edited/drivers/ide/pci/cs5530.c 2004-06-16 15:49:00 +02:00
-@@ -267,7 +267,7 @@
+@@ -217,7 +217,7 @@
* Initialize the cs5530 bridge for reliable IDE DMA operation.
*/
@@ -181,7 +170,7 @@
{
struct pci_dev *master_0 = NULL, *cs5530_0 = NULL;
unsigned long flags;
-@@ -366,7 +366,7 @@
+@@ -308,7 +308,7 @@
* performs channel-specific pre-initialization before drive probing.
*/
@@ -192,7 +181,7 @@
u32 d0_timings;
--- 1.17/drivers/ide/pci/cy82c693.c 2004-03-18 15:20:56 +01:00
+++ edited/drivers/ide/pci/cy82c693.c 2004-06-16 15:44:17 +02:00
-@@ -334,7 +334,7 @@
+@@ -391,7 +391,7 @@
/*
* this function is called during init and is used to setup the cy82c693 chip
*/
@@ -201,7 +190,7 @@
{
if (PCI_FUNC(dev->devfn) != 1)
return 0;
-@@ -386,7 +386,7 @@
+@@ -443,7 +443,7 @@
/*
* the init function - called for each ide channel once
*/
@@ -210,7 +199,7 @@
{
hwif->autodma = 0;
-@@ -410,9 +410,9 @@
+@@ -467,9 +467,9 @@
hwif->drives[1].autodma = hwif->autodma;
}
@@ -224,7 +213,7 @@
primary = hwif;
--- 1.18/drivers/ide/pci/it8172.c 2004-06-01 21:04:38 +02:00
+++ edited/drivers/ide/pci/it8172.c 2004-06-16 15:48:50 +02:00
-@@ -238,7 +238,7 @@
+@@ -216,7 +216,7 @@
return 0;
}
@@ -233,7 +222,7 @@
{
unsigned char progif;
-@@ -252,7 +252,7 @@
+@@ -230,7 +230,7 @@
}
@@ -244,7 +233,7 @@
unsigned long cmdBase, ctrlBase;
--- 1.19/drivers/ide/pci/ns87415.c 2004-06-15 18:29:40 +02:00
+++ edited/drivers/ide/pci/ns87415.c 2004-06-16 15:48:42 +02:00
-@@ -130,7 +130,7 @@
+@@ -195,7 +195,7 @@
return __ide_dma_check(drive);
}
@@ -255,7 +244,7 @@
unsigned int ctrl, using_inta;
--- 1.18/drivers/ide/pci/opti621.c 2004-06-01 21:04:38 +02:00
+++ edited/drivers/ide/pci/opti621.c 2004-06-16 15:48:02 +02:00
-@@ -328,7 +328,7 @@
+@@ -326,7 +326,7 @@
/*
* init_hwif_opti621() is called once for each hwif found at boot.
*/
@@ -264,18 +253,9 @@
{
hwif->autodma = 0;
hwif->drives[0].drive_data = PIO_DONT_KNOW;
-@@ -348,7 +348,7 @@
- hwif->drives[1].autodma = hwif->autodma;
- }
-
--static void __init init_setup_opti621 (struct pci_dev *dev, ide_pci_device_t *d)
-+static void __devinit init_setup_opti621 (struct pci_dev *dev, ide_pci_device_t *d)
- {
- ide_setup_pci_device(dev, d);
- }
--- 1.19/drivers/ide/pci/sc1200.c 2004-06-15 18:29:40 +02:00
+++ edited/drivers/ide/pci/sc1200.c 2004-06-16 15:47:38 +02:00
-@@ -523,7 +523,7 @@
+@@ -459,7 +459,7 @@
* This gets invoked by the IDE driver once for each channel,
* and performs channel-specific pre-initialization before drive probing.
*/
@@ -286,7 +266,7 @@
hwif->serialized = hwif->mate->serialized = 1;
--- 1.29/drivers/ide/pci/serverworks.c 2004-06-01 21:04:38 +02:00
+++ edited/drivers/ide/pci/serverworks.c 2004-06-16 15:44:17 +02:00
-@@ -510,7 +510,7 @@
+@@ -341,7 +341,7 @@
return __ide_dma_end(drive);
}
@@ -295,7 +275,7 @@
{
unsigned int reg;
u8 btr;
-@@ -630,7 +630,7 @@
+@@ -442,7 +442,7 @@
return (dev->irq) ? dev->irq : 0;
}
@@ -304,7 +284,7 @@
{
return 1;
}
-@@ -642,7 +642,7 @@
+@@ -454,7 +454,7 @@
* Bit 14 clear = primary IDE channel does not have 80-pin cable.
* Bit 14 set = primary IDE channel has 80-pin cable.
*/
@@ -313,7 +293,7 @@
{
struct pci_dev *dev = hwif->pci_dev;
if (dev->subsystem_vendor == PCI_VENDOR_ID_DELL &&
-@@ -660,7 +660,7 @@
+@@ -472,7 +472,7 @@
*
* WARNING: this only works on Alpine hardware!
*/
@@ -322,7 +302,7 @@
{
struct pci_dev *dev = hwif->pci_dev;
if (dev->subsystem_vendor == PCI_VENDOR_ID_SUN &&
-@@ -671,7 +671,7 @@
+@@ -483,7 +483,7 @@
return 0;
}
@@ -331,7 +311,7 @@
{
struct pci_dev *dev = hwif->pci_dev;
-@@ -696,7 +696,7 @@
+@@ -508,7 +508,7 @@
}
#undef CAN_SW_DMA
@@ -340,7 +320,7 @@
{
u8 dma_stat = 0;
-@@ -744,7 +744,7 @@
+@@ -556,7 +556,7 @@
/*
* We allow the BM-DMA driver to only work on enabled interfaces.
*/
@@ -366,7 +346,7 @@
d->bootable = NEVER_BOARD;
--- 1.27/drivers/ide/pci/sis5513.c 2004-06-15 18:29:40 +02:00
+++ edited/drivers/ide/pci/sis5513.c 2004-06-16 15:47:18 +02:00
-@@ -746,7 +746,7 @@
+@@ -726,7 +726,7 @@
*/
/* Chip detection and general config */
@@ -375,7 +355,7 @@
{
struct pci_dev *host;
int i = 0;
-@@ -890,7 +890,7 @@
+@@ -879,7 +879,7 @@
return 0;
}
@@ -384,7 +364,7 @@
{
u8 ata66 = 0;
-@@ -908,7 +908,7 @@
+@@ -897,7 +897,7 @@
return ata66;
}
@@ -395,7 +375,7 @@
--- 1.20/drivers/ide/pci/sl82c105.c 2004-06-15 18:29:40 +02:00
+++ edited/drivers/ide/pci/sl82c105.c 2004-06-16 15:47:12 +02:00
-@@ -388,7 +388,7 @@
+@@ -386,7 +386,7 @@
* channel 0 here at least, but channel 1 has to be enabled by
* firmware or arch code. We still set both to 16 bits mode.
*/
@@ -404,7 +384,7 @@
{
u32 val;
-@@ -401,7 +401,7 @@
+@@ -399,7 +399,7 @@
return dev->irq;
}
@@ -413,7 +393,7 @@
{
unsigned int rev;
u8 dma_state;
-@@ -433,7 +433,7 @@
+@@ -431,7 +431,7 @@
* Initialise the chip
*/
@@ -424,7 +404,7 @@
u32 val;
--- 1.22/drivers/ide/pci/slc90e66.c 2004-06-15 18:29:40 +02:00
+++ edited/drivers/ide/pci/slc90e66.c 2004-06-16 15:47:02 +02:00
-@@ -325,7 +325,7 @@
+@@ -196,7 +196,7 @@
return 0;
}
@@ -435,7 +415,7 @@
u8 mask = hwif->channel ? 0x01 : 0x02; /* bit0:Primary */
--- 1.9/drivers/ide/pci/triflex.c 2004-06-15 18:29:40 +02:00
+++ edited/drivers/ide/pci/triflex.c 2004-06-16 15:46:54 +02:00
-@@ -190,7 +190,7 @@
+@@ -130,7 +130,7 @@
return hwif->ide_dma_on(drive);
}
@@ -446,7 +426,7 @@
hwif->speedproc = &triflex_tune_chipset;
--- 1.23/drivers/ide/pci/via82cxxx.c 2004-06-15 18:29:40 +02:00
+++ edited/drivers/ide/pci/via82cxxx.c 2004-06-16 15:46:29 +02:00
-@@ -414,7 +414,7 @@
+@@ -418,7 +418,7 @@
* and initialize its drive independent registers.
*/
@@ -455,7 +435,7 @@
{
struct pci_dev *isa = NULL;
u8 t, v;
-@@ -575,7 +575,7 @@
+@@ -579,7 +579,7 @@
return 0;
}