q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers/video
History
Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 
* '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 <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...

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
2011-11-06 19:44:47 -08:00
..
aty radeonfb: use display information in info not in var for panning 2011-08-19 10:30:16 +02:00
backlight Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
console locking, video: Annotate vga console lock as raw 2011-09-13 11:12:04 +02:00
display Fix common misspellings 2011-03-31 11:26:23 -03:00
geode gx1fb: Fix section mismatch warnings 2011-06-24 17:00:31 +09:00
i810 treewide: fix potentially dangerous trailing ';' in #defined values/expressions 2011-07-21 14:10:00 +02:00
intelfb intelfb: use display information in info not in var for panning 2011-08-19 10:32:31 +02:00
kyro Fix common misspellings 2011-03-31 11:26:23 -03:00
logo
matrox Fix common misspellings 2011-03-31 11:26:23 -03:00
mb862xx video: Add module.h to drivers/video files who really use it. 2011-10-31 19:31:33 -04:00
mbx ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
msm video: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/video 2011-10-31 19:31:33 -04:00
nvidia
omap video: Add module.h to drivers/video files who really use it. 2011-10-31 19:31:33 -04:00
omap2 video: Add module.h to drivers/video files who really use it. 2011-10-31 19:31:33 -04:00
pnx4008 ARM: gpio: pnx4008: convert drivers to use asm/gpio.h rather than mach/gpio.h 2011-08-08 14:27:58 +01:00
riva
savage video: Add module.h to drivers/video files who really use it. 2011-10-31 19:31:33 -04:00
sis sisfb: use display information in info not in var for panning 2011-08-19 10:34:52 +02:00
vermilion atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
via video: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/video 2011-10-31 19:31:33 -04:00
68328fb.c 68328fb: use display information in info not in var for panning 2011-08-19 10:28:58 +02:00
acornfb.c acornfb: use display information in info not in var for panning 2011-08-19 10:29:34 +02:00
acornfb.h
amba-clcd.c clk: amba-clcd: convert to clk_prepare()/clk_unprepare() 2011-09-27 09:25:51 +01:00
amifb.c fbdev/amifb: Remove superfluous alignment of frame buffer memory 2011-05-24 16:26:31 +09:00
arcfb.c video: Convert vmalloc/memset to vzalloc 2011-06-02 17:25:35 +09:00
arkfb.c arkfb: use display information in info not in var for panning 2011-08-19 10:29:44 +02:00
asiliantfb.c
atafb.c m68k/atari: Do not use "/" in interrupt names 2011-05-19 18:19:10 +02:00
atafb.h
atafb_iplan2p2.c
atafb_iplan2p4.c
atafb_iplan2p8.c
atafb_mfb.c
atafb_utils.h
atmel_lcdfb.c video: Add module.h to drivers/video files who really use it. 2011-10-31 19:31:33 -04:00
au1100fb.c fb: fix au1100fb bitrot. 2011-10-03 15:52:38 +00:00
au1100fb.h fb: fix au1100fb bitrot. 2011-10-03 15:52:38 +00:00
au1200fb.c video: irq: Remove IRQF_DISABLED 2011-10-03 15:52:22 +00:00
au1200fb.h
bf54x-lq043fb.c video: irq: Remove IRQF_DISABLED 2011-10-03 15:52:22 +00:00
bf537-lq035.c fbdev: bf537-lq035: add missing blacklight properties type 2011-06-02 17:07:35 +09:00
bfin-lq035q1-fb.c video: irq: Remove IRQF_DISABLED 2011-10-03 15:52:22 +00:00
bfin-t350mcqb-fb.c video: irq: Remove IRQF_DISABLED 2011-10-03 15:52:22 +00:00
bfin_adv7393fb.c video: irq: Remove IRQF_DISABLED 2011-10-03 15:52:22 +00:00
bfin_adv7393fb.h Fix common misspellings 2011-03-31 11:26:23 -03:00
broadsheetfb.c video: Convert vmalloc/memset to vzalloc 2011-06-02 17:25:35 +09:00
bt431.h
bt455.h
bw2.c
c2p.h
c2p_core.h
c2p_iplan2.c
c2p_planar.c
carminefb.c video: Add module.h to drivers/video files who really use it. 2011-10-31 19:31:33 -04:00
carminefb.h
carminefb_regs.h
cfbcopyarea.c
cfbfillrect.c
cfbimgblt.c
cg3.c
cg6.c
cg14.c
chipsfb.c
cirrusfb.c
clps711xfb.c
cobalt_lcdfb.c video: Add module.h to drivers/video files who really use it. 2011-10-31 19:31:33 -04:00
controlfb.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next 2011-08-29 09:14:30 +00:00
controlfb.h
cyber2000fb.c
cyber2000fb.h
da8xx-fb.c video: da8xx-fb: Increased resolution configuration of revised LCDC IP 2011-10-04 09:48:58 +00:00
dnfb.c
edid.h
efifb.c efifb: Fix call to wrong unregister function 2011-06-14 16:37:46 +09:00
ep93xx-fb.c video: Add module.h to drivers/video files who really use it. 2011-10-31 19:31:33 -04:00
epson1355fb.c
fb-puv3.c fbdev: unicore32: use display information in info not in var for panning 2011-08-19 10:31:01 +02:00
fb_ddc.c video: Add module.h to drivers/video files who really use it. 2011-10-31 19:31:33 -04:00
fb_defio.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next 2011-08-29 09:14:30 +00:00
fb_draw.h
fb_notify.c video: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/video 2011-10-31 19:31:33 -04:00
fb_sys_fops.c
fbcmap.c
fbcvt.c
fbmem.c fb: avoid possible deadlock caused by fb_set_suspend 2011-09-02 17:58:29 +00:00
fbmon.c fbdev: fix parsing of standard timings 2011-09-01 00:31:05 +00:00
fbsysfs.c fb: avoid possible deadlock caused by fb_set_suspend 2011-09-02 17:58:29 +00:00
ffb.c
fm2fb.c Fix common misspellings 2011-03-31 11:26:23 -03:00
fsl-diu-fb.c drivers/video: fsl-diu-fb: merge diu_pool into fsl_diu_data 2011-10-05 01:16:36 +00:00
g364fb.c g364fb: use display information in info not in var for panning 2011-08-19 10:31:09 +02:00
gbefb.c Fix common misspellings 2011-03-31 11:26:23 -03:00
grvga.c video: Add Aeroflex Gaisler GRVGA framebuffer device driver 2011-07-13 16:58:52 +09:00
gxt4500.c gxt4500: use display information in info not in var for panning 2011-08-19 10:31:17 +02:00
hecubafb.c hecubafb: add module_put on error path in hecubafb_probe() 2011-06-24 17:00:39 +09:00
hgafb.c hgafb: use display information in info not in var for panning 2011-08-19 10:31:28 +02:00
hitfb.c
hpfb.c
igafb.c doc: fix broken references 2011-09-27 18:08:04 +02:00
imsttfb.c imsttfb: use display information in info not in var for panning 2011-08-19 10:31:39 +02:00
imxfb.c drivers/video/imxfb.c: add missing clk_put 2011-06-02 17:07:41 +09:00
jz4740_fb.c
Kconfig Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
leo.c
macfb.c
macmodes.c
macmodes.h
Makefile Add support for SMSC UFX6000/7000 USB display adapters 2011-09-05 16:21:30 +00:00
maxinefb.c
metronomefb.c video: Convert vmalloc/memset to vzalloc 2011-06-02 17:25:35 +09:00
modedb.c fbdev: fix indentation in modedb.c 2011-09-14 16:40:52 +00:00
mx3fb.c mx3fb: fix NULL pointer dereference in screen blanking. 2011-10-03 15:52:32 +00:00
mxsfb.c video: mxsfb: add missing include of linux/module.h 2011-09-01 00:28:24 +00:00
n411.c
neofb.c neofb: use display information in info not in var for panning 2011-08-19 10:33:02 +02:00
nuc900fb.c video: irq: Remove IRQF_DISABLED 2011-10-03 15:52:22 +00:00
nuc900fb.h Fix common misspellings 2011-03-31 11:26:23 -03:00
offb.c
output.c
p9100.c
platinumfb.c video: platinumfb: Add __devexit_p at necessary place 2011-10-15 00:19:58 +00:00
platinumfb.h
pm2fb.c pm2fb: use display information in info not in var for panning 2011-08-19 10:33:16 +02:00
pm3fb.c pm3fb: use display information in info not in var for panning 2011-08-19 10:34:01 +02:00
pmag-aa-fb.c
pmag-ba-fb.c
pmagb-b-fb.c
ps3fb.c video: irq: Remove IRQF_DISABLED 2011-10-03 15:52:22 +00:00
pvr2fb.c
pxa3xx-gcu.c video: irq: Remove IRQF_DISABLED 2011-10-03 15:52:22 +00:00
pxa3xx-gcu.h
pxa168fb.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
pxa168fb.h
pxafb.c Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 19:55:06 -07:00
pxafb.h
q40fb.c
s1d13xxxfb.c
s3c-fb.c video: s3c-fb: Add S5P64X0 specific s3c_fb_driverdata 2011-09-14 17:03:58 +00:00
s3c2410fb.c video: irq: Remove IRQF_DISABLED 2011-10-03 15:52:22 +00:00
s3c2410fb.h
s3fb.c s3fb: use display information in info not in var for panning 2011-08-19 10:34:34 +02:00
sa1100fb.c video: irq: Remove IRQF_DISABLED 2011-10-03 15:52:22 +00:00
sa1100fb.h
sbuslib.c
sbuslib.h
sgivwfb.c
sh7760fb.c drivers/video: Convert release_resource to release_mem_region 2011-05-24 16:08:54 +09:00
sh_mipi_dsi.c video: Add module.h to drivers/video files who really use it. 2011-10-31 19:31:33 -04:00
sh_mobile_hdmi.c fb: sh-mobile: Fix deadlock risk between lock_fb_info() and console_lock() 2011-09-02 18:21:21 +00:00
sh_mobile_lcdcfb.c video: Add module.h to drivers/video files who really use it. 2011-10-31 19:31:33 -04:00
sh_mobile_lcdcfb.h fbdev: sh_mobile_lcdc: Restart LCDC in runtime PM resume handler 2011-08-19 08:22:41 +02:00
sh_mobile_meram.c sh_mobile_meram: Reset ICBs at unregistration time 2011-09-05 16:37:13 +00:00
skeletonfb.c video: Fix speficied typo 2011-06-24 17:14:39 +09:00
sm501fb.c sm501fb: use display information in info not in var for panning 2011-08-19 10:35:10 +02:00
smscufx.c smscufx: change edid data to u8 instead of char 2011-10-03 15:52:05 +00:00
sstfb.c Fix common misspellings 2011-03-31 11:26:23 -03:00
sticore.h Fix common misspellings 2011-03-31 11:26:23 -03:00
stifb.c
sunxvr500.c
sunxvr1000.c
sunxvr2500.c
svgalib.c
syscopyarea.c
sysfillrect.c
sysimgblt.c
tcx.c
tdfxfb.c Fix common misspellings 2011-03-31 11:26:23 -03:00
tgafb.c
tmiofb.c video: irq: Remove IRQF_DISABLED 2011-10-03 15:52:22 +00:00
tridentfb.c tridentfb: use display information in info not in var for panning 2011-08-19 10:35:18 +02:00
udlfb.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next 2011-08-29 09:14:30 +00:00
uvesafb.c
valkyriefb.c video: Fix speficied typo 2011-06-24 17:14:39 +09:00
valkyriefb.h
vesafb.c vesafb: fix memory leak 2011-07-04 16:02:48 +09:00
vfb.c vfb: use display information in info not in var for panning 2011-08-19 10:35:27 +02:00
vga16fb.c vga16fb: use display information in info not in var for panning 2011-08-19 10:35:34 +02:00
vgastate.c
vt8500lcdfb.c video: irq: Remove IRQF_DISABLED 2011-10-03 15:52:22 +00:00
vt8500lcdfb.h
vt8623fb.c vt8623fb: use display information in info not in var for panning 2011-08-19 10:36:20 +02:00
w100fb.c video: Add module.h to drivers/video files who really use it. 2011-10-31 19:31:33 -04:00
w100fb.h
wm8505fb.c
wm8505fb_regs.h
wmt_ge_rops.c
wmt_ge_rops.h
xen-fbfront.c video: Convert vmalloc/memset to vzalloc 2011-06-02 17:25:35 +09:00
xilinxfb.c Remove unneeded version.h includes from drivers/video/ 2011-06-24 17:16:51 +09:00