Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f3d17fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

parents 4f07118f 70d374ea
Loading
Loading
Loading
Loading
+24 −16
Original line number Original line Diff line number Diff line
/*
/*
 *  ahci.c - AHCI SATA support
 *  ahci.c - AHCI SATA support
 *
 *
 *  Copyright 2004 Red Hat, Inc.
 *  Maintained by:  Jeff Garzik <jgarzik@pobox.com>
 *    		    Please ALWAYS copy linux-ide@vger.kernel.org
 *		    on emails.
 *
 *
 *  The contents of this file are subject to the Open
 *  Copyright 2004-2005 Red Hat, Inc.
 *  Software License version 1.1 that can be found at
 *  http://www.opensource.org/licenses/osl-1.1.txt and is included herein
 *  by reference.
 *
 *
 *  Alternatively, the contents of this file may be used under the terms
 *  of the GNU General Public License version 2 (the "GPL") as distributed
 *  in the kernel source COPYING file, in which case the provisions of
 *  the GPL are applicable instead of the above.  If you wish to allow
 *  the use of your version of this file only under the terms of the
 *  GPL and not to allow others to use your version of this file under
 *  the OSL, indicate your decision by deleting the provisions above and
 *  replace them with the notice and other provisions required by the GPL.
 *  If you do not delete the provisions above, a recipient may use your
 *  version of this file under either the OSL or the GPL.
 *
 *
 * Version 1.0 of the AHCI specification:
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2, or (at your option)
 *  any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; see the file COPYING.  If not, write to
 *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 *
 * libata documentation is available via 'make {ps|pdf}docs',
 * as Documentation/DocBook/libata.*
 *
 * AHCI hardware documentation:
 * http://www.intel.com/technology/serialata/pdf/rev1_0.pdf
 * http://www.intel.com/technology/serialata/pdf/rev1_0.pdf
 * http://www.intel.com/technology/serialata/pdf/rev1_1.pdf
 *
 *
 */
 */


+38 −20
Original line number Original line Diff line number Diff line
/*
/*

 *    ata_piix.c - Intel PATA/SATA controllers
    ata_piix.c - Intel PATA/SATA controllers
 *

 *    Maintained by:  Jeff Garzik <jgarzik@pobox.com>
    Maintained by:  Jeff Garzik <jgarzik@pobox.com>
 *    		    Please ALWAYS copy linux-ide@vger.kernel.org
    		    Please ALWAYS copy linux-ide@vger.kernel.org
 *		    on emails.
		    on emails.
 *

 *

 *	Copyright 2003-2005 Red Hat Inc
	Copyright 2003-2004 Red Hat Inc
 *	Copyright 2003-2005 Jeff Garzik
	Copyright 2003-2004 Jeff Garzik
 *

 *

 *	Copyright header from piix.c:
	Copyright header from piix.c:
 *

 *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
    Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
 *  Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>
    Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>
 *  Copyright (C) 2003 Red Hat Inc <alan@redhat.com>
    Copyright (C) 2003 Red Hat Inc <alan@redhat.com>
 *

 *
    May be copied or modified under the terms of the GNU General Public License
 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2, or (at your option)
 *  any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; see the file COPYING.  If not, write to
 *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 *
 *  libata documentation is available via 'make {ps|pdf}docs',
 *  as Documentation/DocBook/libata.*
 *
 *  Hardware documentation available at http://developer.intel.com/
 *
 */
 */


#include <linux/kernel.h>
#include <linux/kernel.h>
+31 −21
Original line number Original line Diff line number Diff line
/*
/*
   libata-core.c - helper library for ATA
 *  libata-core.c - helper library for ATA

 *
   Copyright 2003-2004 Red Hat, Inc.  All rights reserved.
 *  Maintained by:  Jeff Garzik <jgarzik@pobox.com>
   Copyright 2003-2004 Jeff Garzik
 *    		    Please ALWAYS copy linux-ide@vger.kernel.org

 *		    on emails.
   The contents of this file are subject to the Open
 *
   Software License version 1.1 that can be found at
 *  Copyright 2003-2004 Red Hat, Inc.  All rights reserved.
   http://www.opensource.org/licenses/osl-1.1.txt and is included herein
 *  Copyright 2003-2004 Jeff Garzik
   by reference.
 *

 *
   Alternatively, the contents of this file may be used under the terms
 *  This program is free software; you can redistribute it and/or modify
   of the GNU General Public License version 2 (the "GPL") as distributed
 *  it under the terms of the GNU General Public License as published by
   in the kernel source COPYING file, in which case the provisions of
 *  the Free Software Foundation; either version 2, or (at your option)
   the GPL are applicable instead of the above.  If you wish to allow
 *  any later version.
   the use of your version of this file only under the terms of the
 *
   GPL and not to allow others to use your version of this file under
 *  This program is distributed in the hope that it will be useful,
   the OSL, indicate your decision by deleting the provisions above and
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
   replace them with the notice and other provisions required by the GPL.
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   If you do not delete the provisions above, a recipient may use your
 *  GNU General Public License for more details.
   version of this file under either the OSL or the GPL.
 *

 *  You should have received a copy of the GNU General Public License
 *  along with this program; see the file COPYING.  If not, write to
 *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 *
 *  libata documentation is available via 'make {ps|pdf}docs',
 *  as Documentation/DocBook/libata.*
 *
 *  Hardware documentation available from http://www.t13.org/ and
 *  http://www.sata-io.org/
 *
 */
 */


#include <linux/config.h>
#include <linux/config.h>
+32 −21
Original line number Original line Diff line number Diff line
/*
/*
   libata-scsi.c - helper library for ATA
 *  libata-scsi.c - helper library for ATA

 *
   Copyright 2003-2004 Red Hat, Inc.  All rights reserved.
 *  Maintained by:  Jeff Garzik <jgarzik@pobox.com>
   Copyright 2003-2004 Jeff Garzik
 *    		    Please ALWAYS copy linux-ide@vger.kernel.org

 *		    on emails.
   The contents of this file are subject to the Open
 *
   Software License version 1.1 that can be found at
 *  Copyright 2003-2004 Red Hat, Inc.  All rights reserved.
   http://www.opensource.org/licenses/osl-1.1.txt and is included herein
 *  Copyright 2003-2004 Jeff Garzik
   by reference.
 *

 *
   Alternatively, the contents of this file may be used under the terms
 *  This program is free software; you can redistribute it and/or modify
   of the GNU General Public License version 2 (the "GPL") as distributed
 *  it under the terms of the GNU General Public License as published by
   in the kernel source COPYING file, in which case the provisions of
 *  the Free Software Foundation; either version 2, or (at your option)
   the GPL are applicable instead of the above.  If you wish to allow
 *  any later version.
   the use of your version of this file only under the terms of the
 *
   GPL and not to allow others to use your version of this file under
 *  This program is distributed in the hope that it will be useful,
   the OSL, indicate your decision by deleting the provisions above and
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
   replace them with the notice and other provisions required by the GPL.
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   If you do not delete the provisions above, a recipient may use your
 *  GNU General Public License for more details.
   version of this file under either the OSL or the GPL.
 *

 *  You should have received a copy of the GNU General Public License
 *  along with this program; see the file COPYING.  If not, write to
 *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 *
 *  libata documentation is available via 'make {ps|pdf}docs',
 *  as Documentation/DocBook/libata.*
 *
 *  Hardware documentation available from
 *  - http://www.t10.org/
 *  - http://www.t13.org/
 *
 */
 */


#include <linux/kernel.h>
#include <linux/kernel.h>
+24 −21
Original line number Original line Diff line number Diff line
/*
/*
   libata.h - helper library for ATA
 *  libata.h - helper library for ATA

 *
   Copyright 2003-2004 Red Hat, Inc.  All rights reserved.
 *  Copyright 2003-2004 Red Hat, Inc.  All rights reserved.
   Copyright 2003-2004 Jeff Garzik
 *  Copyright 2003-2004 Jeff Garzik

 *
   The contents of this file are subject to the Open
 *
   Software License version 1.1 that can be found at
 *  This program is free software; you can redistribute it and/or modify
   http://www.opensource.org/licenses/osl-1.1.txt and is included herein
 *  it under the terms of the GNU General Public License as published by
   by reference.
 *  the Free Software Foundation; either version 2, or (at your option)

 *  any later version.
   Alternatively, the contents of this file may be used under the terms
 *
   of the GNU General Public License version 2 (the "GPL") as distributed
 *  This program is distributed in the hope that it will be useful,
   in the kernel source COPYING file, in which case the provisions of
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
   the GPL are applicable instead of the above.  If you wish to allow
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   the use of your version of this file only under the terms of the
 *  GNU General Public License for more details.
   GPL and not to allow others to use your version of this file under
 *
   the OSL, indicate your decision by deleting the provisions above and
 *  You should have received a copy of the GNU General Public License
   replace them with the notice and other provisions required by the GPL.
 *  along with this program; see the file COPYING.  If not, write to
   If you do not delete the provisions above, a recipient may use your
 *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
   version of this file under either the OSL or the GPL.
 *

 *
 *  libata documentation is available via 'make {ps|pdf}docs',
 *  as Documentation/DocBook/libata.*
 *
 */
 */


#ifndef __LIBATA_H__
#ifndef __LIBATA_H__
Loading