lkml.org 
[lkml]   [2005]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [PATCH 2.6.11-rc2 08/14] ide_pci: Merges opti621.h into opti621.c
    From
    Date

    08_ide_pci_opti621_merge.patch

    Merges ide/pci/opti621.h into opti621.c.


    Signed-off-by: Tejun Heo <tj@home-tj.org>


    Index: linux-idepci-export/drivers/ide/pci/opti621.c
    ===================================================================
    --- linux-idepci-export.orig/drivers/ide/pci/opti621.c 2005-02-04 16:07:36.681395063 +0900
    +++ linux-idepci-export/drivers/ide/pci/opti621.c 2005-02-04 16:08:25.782398226 +0900
    @@ -104,8 +104,6 @@

    #include <asm/io.h>

    -#include "opti621.h"
    -
    #define OPTI621_MAX_PIO 3
    /* In fact, I do not have any PIO 4 drive
    * (address: 25 ns, data: 70 ns, recovery: 35 ns),
    @@ -348,6 +346,24 @@ static void __init init_hwif_opti621 (id
    hwif->drives[1].autodma = hwif->autodma;
    }

    +static ide_pci_device_t opti621_chipsets[] __devinitdata = {
    + { /* 0 */
    + .name = "OPTI621",
    + .init_hwif = init_hwif_opti621,
    + .channels = 2,
    + .autodma = AUTODMA,
    + .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
    + .bootable = ON_BOARD,
    + },{ /* 1 */
    + .name = "OPTI621X",
    + .init_hwif = init_hwif_opti621,
    + .channels = 2,
    + .autodma = AUTODMA,
    + .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
    + .bootable = ON_BOARD,
    + }
    +};
    +
    static int __devinit opti621_init_one(struct pci_dev *dev, const struct pci_device_id *id)
    {
    return ide_setup_pci_device(dev, &opti621_chipsets[id->driver_data]);
    Index: linux-idepci-export/drivers/ide/pci/opti621.h
    ===================================================================
    --- linux-idepci-export.orig/drivers/ide/pci/opti621.h 2005-02-04 16:07:36.681395063 +0900
    +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
    @@ -1,28 +0,0 @@
    -#ifndef OPTI621_H
    -#define OPTI621_H
    -
    -#include <linux/config.h>
    -#include <linux/pci.h>
    -#include <linux/ide.h>
    -
    -static void init_hwif_opti621(ide_hwif_t *);
    -
    -static ide_pci_device_t opti621_chipsets[] __devinitdata = {
    - { /* 0 */
    - .name = "OPTI621",
    - .init_hwif = init_hwif_opti621,
    - .channels = 2,
    - .autodma = AUTODMA,
    - .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
    - .bootable = ON_BOARD,
    - },{ /* 1 */
    - .name = "OPTI621X",
    - .init_hwif = init_hwif_opti621,
    - .channels = 2,
    - .autodma = AUTODMA,
    - .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
    - .bootable = ON_BOARD,
    - }
    -};
    -
    -#endif /* OPTI621_H */
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 14:10    [W:2.199 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site