diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-03-23 13:35:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-23 13:35:04 -0700 |
| commit | 8be7cdccacfbfc707e7370cad9bb168defed636f (patch) | |
| tree | 8416607b62ec352176c81afd6f4e7b571ceb957f /include/linux | |
| parent | sunqe: Convert to net_device_ops. (diff) | |
| parent | ucc_geth: Fix oops when using fixed-link support (diff) | |
| download | linux-dev-8be7cdccacfbfc707e7370cad9bb168defed636f.tar.xz linux-dev-8be7cdccacfbfc707e7370cad9bb168defed636f.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ucc_geth.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dca.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/include/linux/dca.h b/include/linux/dca.h index b00a753eda53..9c20c7e87d0a 100644 --- a/include/linux/dca.h +++ b/include/linux/dca.h @@ -1,3 +1,23 @@ +/* + * Copyright(c) 2007 - 2009 Intel Corporation. All rights reserved. + * + * 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 of the License, 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; if not, write to the Free Software Foundation, Inc., 59 + * Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * The full GNU General Public License is included in this distribution in the + * file called COPYING. + */ #ifndef DCA_H #define DCA_H /* DCA Provider API */ |