diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-05-28 13:36:49 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-05-28 13:36:49 +0300 |
| commit | 31eb07f5f8febab3d68b9d1a350d9e5a4bdf6780 (patch) | |
| tree | c5bf60cbb8a7bb5df466f8d6248c7223712348a2 /include/linux/platform_data | |
| parent | 262888fcc70d42343dfb137a021d45be05183da6 (diff) | |
| parent | bbbe8c8c596b3784a2ed08772900e827f8ba72c5 (diff) | |
| download | linux-31eb07f5f8febab3d68b9d1a350d9e5a4bdf6780.tar.xz | |
Merge tag 'mac80211-next-for-davem-2015-05-06' into iwlwifi-next
Lots of updates for net-next for this cycle. As usual, we have
a lot of small fixes and cleanups, the bigger items are:
* proper mac80211 rate control locking, to fix some random crashes
(this required changing other locking as well)
* mac80211 "fast-xmit", a mechanism to reduce, in most cases, the
amount of code we execute while going from ndo_start_xmit() to
the driver
* this also clears the way for properly supporting S/G and checksum
and segmentation offloads
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/st33zp24.h (renamed from include/linux/platform_data/tpm_stm_st33.h) | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/include/linux/platform_data/tpm_stm_st33.h b/include/linux/platform_data/st33zp24.h index ff75310c0f47..817dfdb37885 100644 --- a/include/linux/platform_data/tpm_stm_st33.h +++ b/include/linux/platform_data/st33zp24.h @@ -1,6 +1,6 @@ /* - * STMicroelectronics TPM I2C Linux driver for TPM ST33ZP24 - * Copyright (C) 2009, 2010 STMicroelectronics + * STMicroelectronics TPM Linux driver for TPM 1.2 ST33ZP24 + * Copyright (C) 2009 - 2015 STMicroelectronics * * 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 @@ -14,20 +14,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, see <http://www.gnu.org/licenses/>. - * - * STMicroelectronics version 1.2.0, Copyright (C) 2010 - * STMicroelectronics comes with ABSOLUTELY NO WARRANTY. - * This is free software, and you are welcome to redistribute it - * under certain conditions. - * - * @Author: Christophe RICARD tpmsupport@st.com - * - * @File: stm_st33_tpm.h - * - * @Date: 09/15/2010 */ -#ifndef __STM_ST33_TPM_H__ -#define __STM_ST33_TPM_H__ +#ifndef __ST33ZP24_H__ +#define __ST33ZP24_H__ #define TPM_ST33_I2C "st33zp24-i2c" #define TPM_ST33_SPI "st33zp24-spi" @@ -36,4 +25,4 @@ struct st33zp24_platform_data { int io_lpcpd; }; -#endif /* __STM_ST33_TPM_H__ */ +#endif /* __ST33ZP24_H__ */ |