Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / drivers / media / dvb-frontends / cx24123.c

diff --git a/drivers/media/dvb-frontends/cx24123.c b/drivers/media/dvb-frontends/cx24123.c
index 8aed8cc9f93dda1f68fd53c005662c16f6c63710..4ae3d922a8e8a962c5c7e3fb34b3e524eee67cb8 100644 (file)
--- a/drivers/media/dvb-frontends/cx24123.c
+++ b/drivers/media/dvb-frontends/cx24123.c
@@ -16,10 +16,6 @@
  *   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., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/slab.h>
@@ -653,7 +649,7 @@ static int cx24123_pll_tune(struct dvb_frontend *fe)
        dprintk("frequency=%i\n", p->frequency);
 
        if (cx24123_pll_calculate(fe) != 0) {
-               err("%s: cx24123_pll_calcutate failed\n", __func__);
+               err("%s: cx24123_pll_calculate failed\n", __func__);
                return -EINVAL;
        }