1 files changed, 18 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h b/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h
index d4f752e258fd..c0b0b876ab90 100644
--- a/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h
+++ b/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h
@@ -1,9 +1,24 @@
 /*
 * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
 *
- * This program is free software; you may redistribute it and/or modify
+ * This software is available to you under a choice of one of two
- * it under the terms of the GNU General Public License as published by
+ * licenses.  You may choose to be licensed under the terms of the GNU
- * the Free Software Foundation; version 2 of the License.
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

diff --git a/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h b/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h index d4f752e258fd..c0b0b876ab90 100644 --- a/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h +++ b/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h
@@ -1,9 +1,24 @@
1	/*	1	/*
2	* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.	2	* Copyright (c) 2013, Cisco Systems, Inc. All rights reserved.
3	*	3	*
4	* This program is free software; you may redistribute it and/or modify	4	* This software is available to you under a choice of one of two
5	* it under the terms of the GNU General Public License as published by	5	* licenses. You may choose to be licensed under the terms of the GNU
6	* the Free Software Foundation; version 2 of the License.	6	* General Public License (GPL) Version 2, available from the file
		7	* COPYING in the main directory of this source tree, or the
		8	* BSD license below:
		9	*
		10	* Redistribution and use in source and binary forms, with or
		11	* without modification, are permitted provided that the following
		12	* conditions are met:
		13	*
		14	* - Redistributions of source code must retain the above
		15	* copyright notice, this list of conditions and the following
		16	* disclaimer.
		17	*
		18	* - Redistributions in binary form must reproduce the above
		19	* copyright notice, this list of conditions and the following
		20	* disclaimer in the documentation and/or other materials
		21	* provided with the distribution.
7	*	22	*
8	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,	23	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
9	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF	24	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF