linux.git/drivers/staging/media, branch v3.2

media/staging: fix allyesconfig build error

2011-11-17T12:29:02+00:00

Fix x86 allyesconfig builds.  Builds fail due to a non-static variable
named 'debug' in drivers/staging/media/as102:

  arch/x86/built-in.o:arch/x86/kernel/entry_32.S:1296: first defined here
  ld: Warning: size of symbol `debug' changed from 90 in arch/x86/built-in.o to 4 in drivers/built-in.o

Thou shalt have no non-static identifiers that are named 'debug'.

Signed-off-by: Randy Dunlap 
Cc: Pierrick Hascoet 
Signed-off-by: Linus Torvalds

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-07T03:44:47+00:00

* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include 
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include 
  net: sch_generic remove redundant use of 
  net: inet_timewait_sock doesnt need 
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h

staging: Move media drivers to staging/media

2011-11-03T09:59:03+00:00

In practice, it is being hard to distinguish when a patch
should go to staging tree or to the media tree. Better
to distinguish it, by putting the media drivers at a
separate staging directory. Newer staging drivers that include
anything with "dvb*.h", "v4l2*.h" or "videodev2.h" should
go to the drivers/staging/media tree.

Acked-by: Greg Kroah-Hartman 
Signed-off-by: Mauro Carvalho Chehab

[media] staging: as102: Remove conditional compilation based on kernel version

2011-11-03T09:44:09+00:00

Remove #if's related to kernel version and the code not applicable
to 3.2+ kernels.

Cc: Devin Heitmueller 
Signed-off-by: Sylwester Nawrocki 
Signed-off-by: Mauro Carvalho Chehab

[media] staging: as102: Unconditionally compile code dependent on DVB_CORE

2011-11-03T09:44:05+00:00

The driver depends on DVB_CORE so there is no need for conditional
compilation of parts of the code depending on CONFIG_DVB_CORE as
the driver is never compiled with CONFIG_DVB_CORE* disabled.

Cc: Devin Heitmueller 
Signed-off-by: Sylwester Nawrocki 
Signed-off-by: Mauro Carvalho Chehab

[media] staging: as102: Add nBox Tuner Dongle support

2011-11-03T09:44:03+00:00

Add support for nBox Tuner Dongle based on the same chip.

Cc: Devin Heitmueller 
Signed-off-by: Piotr Chmura 
Signed-off-by: Sylwester Nawrocki 
Signed-off-by: Mauro Carvalho Chehab

[media] staging: as102: Enable compilation

2011-11-03T09:44:01+00:00

Fix compilation errors in the USB driver by replacing usb_buffer_free(),
usb_buffer_alloc() with usb_free_coherent() and usb_alloc_coherent().
Add entries for the driver in parent Makefile and Kconfig.

[snjw23@gmail.com: minor edit to changelog]
Cc: Devin Heitmueller 
Signed-off-by: Piotr Chmura 
Signed-off-by: Sylwester Nawrocki 
Signed-off-by: Mauro Carvalho Chehab

[media] staging: as102: Convert the comments to kernel-doc style

2011-11-03T09:43:58+00:00

Also amend some mismatched comments.

Cc: Devin Heitmueller 
Signed-off-by: Sylwester Nawrocki 
Signed-off-by: Mauro Carvalho Chehab

[media] staging: as102: Remove non-linux headers inclusion

2011-11-03T09:43:55+00:00

Remove inclusion of Windows and other not linux related headers.

[snjw23@gmail.com: edited changelog, folded long line in Makefile]
Cc: Devin Heitmueller 
Signed-off-by: Piotr Chmura 
Signed-off-by: Sylwester Nawrocki 
Signed-off-by: Mauro Carvalho Chehab

[media] staging: as102: Fix licensing oversight

2011-11-03T09:43:53+00:00

Fix a couple of files which were supposed by be relicensed as GPL
but were overlooked.

Signed-off-by: Pierrick Hascoet 
Signed-off-by: Devin Heitmueller 
Signed-off-by: Piotr Chmura 
Signed-off-by: Sylwester Nawrocki 
Signed-off-by: Mauro Carvalho Chehab