Deleted Added
full compact
ata-card.c (233282) ata-card.c (242625)
1/*-
2 * Copyright (c) 1998 - 2008 S��ren Schmidt <sos@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 - 2008 S��ren Schmidt <sos@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/ata/ata-card.c 233282 2012-03-21 16:59:39Z marius $");
28__FBSDID("$FreeBSD: head/sys/dev/ata/ata-card.c 242625 2012-11-05 19:16:27Z dim $");
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/ata.h>
33#include <sys/kernel.h>
34#include <sys/module.h>
35#include <sys/bus.h>
36#include <sys/malloc.h>

--- 7 unchanged lines hidden (view full) ---

44#include <dev/ata/ata-all.h>
45#include <dev/pccard/pccard_cis.h>
46#include <dev/pccard/pccardreg.h>
47#include <dev/pccard/pccardvar.h>
48#include <ata_if.h>
49
50#include "pccarddevs.h"
51
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/ata.h>
33#include <sys/kernel.h>
34#include <sys/module.h>
35#include <sys/bus.h>
36#include <sys/malloc.h>

--- 7 unchanged lines hidden (view full) ---

44#include <dev/ata/ata-all.h>
45#include <dev/pccard/pccard_cis.h>
46#include <dev/pccard/pccardreg.h>
47#include <dev/pccard/pccardvar.h>
48#include <ata_if.h>
49
50#include "pccarddevs.h"
51
52static const struct pccard_product const ata_pccard_products[] = {
52static const struct pccard_product ata_pccard_products[] = {
53 PCMCIA_CARD(FREECOM, PCCARDIDE),
54 PCMCIA_CARD(EXP, EXPMULTIMEDIA),
55 PCMCIA_CARD(IODATA3, CBIDE2),
56 PCMCIA_CARD(OEM2, CDROM1),
57 PCMCIA_CARD(OEM2, IDE),
58 PCMCIA_CARD(PANASONIC, KXLC005),
59 PCMCIA_CARD(TEAC, IDECARDII),
60 {NULL}

--- 125 unchanged lines hidden ---
53 PCMCIA_CARD(FREECOM, PCCARDIDE),
54 PCMCIA_CARD(EXP, EXPMULTIMEDIA),
55 PCMCIA_CARD(IODATA3, CBIDE2),
56 PCMCIA_CARD(OEM2, CDROM1),
57 PCMCIA_CARD(OEM2, IDE),
58 PCMCIA_CARD(PANASONIC, KXLC005),
59 PCMCIA_CARD(TEAC, IDECARDII),
60 {NULL}

--- 125 unchanged lines hidden ---