Commit f7abcd38 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds
Browse files

[PATCH] v4l: 877: module em2820 renamed to em28xx and moved to v4l dir 



- Module em2820 renamed to em28xx and moved to V4L dir.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c12097fd

drivers/media/video/em28xx/em28xx-cards.c

+5 −6
Original line number Diff line number Diff line 
/*

   em2820-cards.c - driver for Empia EM2800/EM2820/2840 USB video capture devices

   em28xx-cards.c - driver for Empia EM2800/EM2820/2840 USB video capture devices



   Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com>

		      Ludovico Cavedon <cavedon@sssup.it>

   Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>

		      Markus Rechberger <mrechberger@gmail.com>

		      Mauro Carvalho Chehab <mchehab@brturbo.com.br>



   Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de>

		      Sascha Sommer <saschasommer@freenet.de>



   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
@@ -33,7 +32,7 @@ 
#include <media/tveeprom.h>

#include "msp3400.h"



#include "em2820.h"

#include "em28xx.h"



struct em2820_board em2820_boards[] = {

	[EM2800_BOARD_UNKNOWN] = {

drivers/media/video/em28xx/em28xx-core.c

+4 −5
Original line number Diff line number Diff line 
/*

   em2820-core.c - driver for Empia EM2800/EM2820/2840 USB video capture devices



   Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com>

		      Ludovico Cavedon <cavedon@sssup.it>

   Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>

		      Markus Rechberger <mrechberger@gmail.com>

		      Mauro Carvalho Chehab <mchehab@brturbo.com.br>



   Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de>

		      Sascha Sommer <saschasommer@freenet.de>



   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
@@ -29,7 +28,7 @@ 
#include <linux/usb.h>

#include <linux/vmalloc.h>



#include "em2820.h"

#include "em28xx.h"



/* #define ENABLE_DEBUG_ISOC_FRAMES */

drivers/media/video/em28xx/em28xx-i2c.c

+5 −6
Original line number Diff line number Diff line 
/*

   em2820-i2c.c - driver for Empia EM2800/EM2820/2840 USB video capture devices

   em28xx-i2c.c - driver for Empia EM2800/EM2820/2840 USB video capture devices



   Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com>

		      Ludovico Cavedon <cavedon@sssup.it>

   Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>

		      Markus Rechberger <mrechberger@gmail.com>

		      Mauro Carvalho Chehab <mchehab@brturbo.com.br>



   Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de>

		      Sascha Sommer <saschasommer@freenet.de>



   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
@@ -28,7 +27,7 @@ 
#include <linux/i2c.h>

#include <linux/video_decoder.h>



#include "em2820.h"

#include "em28xx.h"

#include <media/tuner.h>



/* ----------------------------------------------------------- */

drivers/media/video/em28xx/em28xx-input.c

+21 −18
Original line number Diff line number Diff line 
/*

 *

 * handle saa7134 IR remotes via linux kernel input layer.

 *

 * 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

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

 *

  handle em28xx IR remotes via linux kernel input layer.



   Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>

		      Markus Rechberger <mrechberger@gmail.com>

		      Mauro Carvalho Chehab <mchehab@brturbo.com.br>

		      Sascha Sommer <saschasommer@freenet.de>



  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

  the Free Software Foundation; either version 2 of the License, or

  (at your option) any later version.



  This program is distributed in the hope that it will be useful,

  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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

 */



#include <linux/module.h>
@@ -27,7 +30,7 @@ 
#include <linux/input.h>

#include <linux/usb.h>



#include "em2820.h"

#include "em28xx.h"



static unsigned int disable_ir = 0;

module_param(disable_ir, int, 0444);

drivers/media/video/em28xx/em28xx-video.c

+11 −11
Original line number Diff line number Diff line 
/*

   em2820-video.c - driver for Empia EM2800/EM2820/2840 USB video capture devices

   em28xx-video.c - driver for Empia EM2800/EM2820/2840 USB video capture devices



   Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com>

		      Ludovico Cavedon <cavedon@sssup.it>

   Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>

		      Markus Rechberger <mrechberger@gmail.com>

		      Mauro Carvalho Chehab <mchehab@brturbo.com.br>



   Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de>

		      Sascha Sommer <saschasommer@freenet.de>



   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
@@ -30,15 +29,16 @@ 
#include <linux/i2c.h>

#include <linux/video_decoder.h>



#include "em2820.h"

#include "em28xx.h"

#include <media/tuner.h>



#define DRIVER_AUTHOR "Markus Rechberger <mrechberger@gmail.com>, " \

			"Ludovico Cavedon <cavedon@sssup.it>, " \

			"Mauro Carvalho Chehab <mchehab@brturbo.com.br>"

#define DRIVER_AUTHOR "Ludovico Cavedon <cavedon@sssup.it>, " \

		      "Markus Rechberger <mrechberger@gmail.com>, " \

		      "Mauro Carvalho Chehab <mchehab@brturbo.com.br>, " \

		      "Sascha Sommer <saschasommer@freenet.de>"



#define DRIVER_NAME         "em2820"

#define DRIVER_DESC         "Empia em2820 based USB video device driver"

#define DRIVER_NAME         "em28xx"

#define DRIVER_DESC         "Empia em28xx based USB video device driver"

#define EM2820_VERSION_CODE  KERNEL_VERSION(0, 0, 1)



#define em2820_videodbg(fmt, arg...) do {\

CRA Git | Maintained and supported by SUSTech CRA and CCSE