2 files changed, 46 insertions, 38 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 9d25e9886d60..a5b74efab067 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -1,24 +1,29 @@
 /*
-   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.*
+ *
+ *  Hardware documentation available from http://www.t13.org/
+ *
 */
 #ifndef __LINUX_ATA_H__
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 7c09540c52bc..fc05a9899288 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1,23 +1,26 @@
 /*
-   Copyright 2003-2004 Red Hat, Inc.  All rights reserved.
+ *  Copyright 2003-2005 Red Hat, Inc.  All rights reserved.
-   Copyright 2003-2004 Jeff Garzik
+ *  Copyright 2003-2005 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 __LINUX_LIBATA_H__

diff --git a/include/linux/ata.h b/include/linux/ata.h index 9d25e9886d60..a5b74efab067 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h
@@ -1,24 +1,29 @@
1		1
2	/*	2	/*
3	Copyright 2003-2004 Red Hat, Inc. All rights reserved.	3	* Copyright 2003-2004 Red Hat, Inc. All rights reserved.
4	Copyright 2003-2004 Jeff Garzik	4	* Copyright 2003-2004 Jeff Garzik
5		5	*
6	The contents of this file are subject to the Open	6	*
7	Software License version 1.1 that can be found at	7	* This program is free software; you can redistribute it and/or modify
8	http://www.opensource.org/licenses/osl-1.1.txt and is included herein	8	* it under the terms of the GNU General Public License as published by
9	by reference.	9	* the Free Software Foundation; either version 2, or (at your option)
10		10	* any later version.
11	Alternatively, the contents of this file may be used under the terms	11	*
12	of the GNU General Public License version 2 (the "GPL") as distributed	12	* This program is distributed in the hope that it will be useful,
13	in the kernel source COPYING file, in which case the provisions of	13	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	the GPL are applicable instead of the above. If you wish to allow	14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	the use of your version of this file only under the terms of the	15	* GNU General Public License for more details.
16	GPL and not to allow others to use your version of this file under	16	*
17	the OSL, indicate your decision by deleting the provisions above and	17	* You should have received a copy of the GNU General Public License
18	replace them with the notice and other provisions required by the GPL.	18	* along with this program; see the file COPYING. If not, write to
19	If you do not delete the provisions above, a recipient may use your	19	* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
20	version of this file under either the OSL or the GPL.	20	*
21		21	*
		22	* libata documentation is available via 'make {ps\|pdf}docs',
		23	* as Documentation/DocBook/libata.*
		24	*
		25	* Hardware documentation available from http://www.t13.org/
		26	*
22	*/	27	*/
23		28
24	#ifndef __LINUX_ATA_H__	29	#ifndef __LINUX_ATA_H__


diff --git a/include/linux/libata.h b/include/linux/libata.h index 7c09540c52bc..fc05a9899288 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h
@@ -1,23 +1,26 @@
1	/*	1	/*
2	Copyright 2003-2004 Red Hat, Inc. All rights reserved.	2	* Copyright 2003-2005 Red Hat, Inc. All rights reserved.
3	Copyright 2003-2004 Jeff Garzik	3	* Copyright 2003-2005 Jeff Garzik
4		4	*
5	The contents of this file are subject to the Open	5	*
6	Software License version 1.1 that can be found at	6	* This program is free software; you can redistribute it and/or modify
7	http://www.opensource.org/licenses/osl-1.1.txt and is included herein	7	* it under the terms of the GNU General Public License as published by
8	by reference.	8	* the Free Software Foundation; either version 2, or (at your option)
9		9	* any later version.
10	Alternatively, the contents of this file may be used under the terms	10	*
11	of the GNU General Public License version 2 (the "GPL") as distributed	11	* This program is distributed in the hope that it will be useful,
12	in the kernel source COPYING file, in which case the provisions of	12	* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	the GPL are applicable instead of the above. If you wish to allow	13	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	the use of your version of this file only under the terms of the	14	* GNU General Public License for more details.
15	GPL and not to allow others to use your version of this file under	15	*
16	the OSL, indicate your decision by deleting the provisions above and	16	* You should have received a copy of the GNU General Public License
17	replace them with the notice and other provisions required by the GPL.	17	* along with this program; see the file COPYING. If not, write to
18	If you do not delete the provisions above, a recipient may use your	18	* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
19	version of this file under either the OSL or the GPL.	19	*
20		20	*
		21	* libata documentation is available via 'make {ps\|pdf}docs',
		22	* as Documentation/DocBook/libata.*
		23	*
21	*/	24	*/
22		25
23	#ifndef __LINUX_LIBATA_H__	26	#ifndef __LINUX_LIBATA_H__