diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-13 13:14:28 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-13 13:14:28 -0500 |
| commit | f647a52e1576f9c92cc9c02d5756cd0207295a2b (patch) | |
| tree | 9e8e69dd01504fad5523c99d7e125e8ff865b65c /include/linux/platform_data | |
| parent | 68536053600425c24aba031c45f053d447eedd9c (diff) | |
| parent | 55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/pn544.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/platform_data/pn544.h b/include/linux/platform_data/pn544.h index 713bfd703342..5ce1ab983f44 100644 --- a/include/linux/platform_data/pn544.h +++ b/include/linux/platform_data/pn544.h | |||
| @@ -16,8 +16,7 @@ | |||
| 16 | * GNU General Public License for more details. | 16 | * GNU General Public License for more details. |
| 17 | * | 17 | * |
| 18 | * You should have received a copy of the GNU General Public License | 18 | * You should have received a copy of the GNU General Public License |
| 19 | * along with this program; if not, write to the Free Software | 19 | * along with this program; if not, see <http://www.gnu.org/licenses/>. |
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 21 | */ | 20 | */ |
| 22 | 21 | ||
| 23 | #ifndef _PN544_H_ | 22 | #ifndef _PN544_H_ |