diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-02-08 19:16:17 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-08 19:16:17 +0100 |
| commit | f5237f278f30a92401539a54f87ee0c717b6f818 (patch) | |
| tree | 209d4fd6fb00e660c76ca8ac5d4caed59dbb9957 /drivers/net/wireless/iwlwifi/iwl-config.h | |
| parent | Merge branch 'tg3' (diff) | |
| parent | rtlwifi: rtl8723ae: Fix W=1 compile warnings (diff) | |
| download | linux-f5237f278f30a92401539a54f87ee0c717b6f818.tar.xz linux-f5237f278f30a92401539a54f87ee0c717b6f818.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-config.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-config.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h index 864219d2136a..743b48343358 100644 --- a/drivers/net/wireless/iwlwifi/iwl-config.h +++ b/drivers/net/wireless/iwlwifi/iwl-config.h @@ -5,7 +5,7 @@ * * GPL LICENSE SUMMARY * - * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved. + * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of version 2 of the GNU General Public License as @@ -30,7 +30,7 @@ * * BSD LICENSE * - * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved. + * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -83,6 +83,7 @@ enum iwl_device_family { IWL_DEVICE_FAMILY_6030, IWL_DEVICE_FAMILY_6050, IWL_DEVICE_FAMILY_6150, + IWL_DEVICE_FAMILY_7000, }; /* |