diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-24 08:57:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-24 08:57:26 -0700 |
commit | 019cddc88f9e4ae0de2c76802f7137210c2101aa (patch) | |
tree | d12338e2dda7e667e40513036d2b020e4745d028 /drivers/i2c/busses/i2c-emev2.c | |
parent | d002924f934ad4d249f6716680433c912831d046 (diff) | |
parent | 00efcdce67a365ec1881a6fbf17f769d690244e9 (diff) |
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull second i2c update from Wolfram Sang:
"As promised, here is my 2nd pull request for I2C, containing:
- removal of the attach_adapter callback, converting its last user
- removal of any __deprecated usage within I2C
- one email address update
- some SPDX conversion"
* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: don't use any __deprecated handling anymore
i2c: use SPDX identifier for Renesas drivers
i2c: ocores: update my email address
i2c: remove deprecated attach_adapter callback
macintosh: therm_windtunnel: drop using attach_adapter
Diffstat (limited to 'drivers/i2c/busses/i2c-emev2.c')
-rw-r--r-- | drivers/i2c/busses/i2c-emev2.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-emev2.c b/drivers/i2c/busses/i2c-emev2.c index ba9b6ea48a31..35b302d983e0 100644 --- a/drivers/i2c/busses/i2c-emev2.c +++ b/drivers/i2c/busses/i2c-emev2.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * I2C driver for the Renesas EMEV2 SoC * * Copyright (C) 2015 Wolfram Sang <wsa@sang-engineering.com> * Copyright 2013 Codethink Ltd. * Copyright 2010-2015 Renesas Electronics Corporation - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. */ #include <linux/clk.h> |