q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers/video
History
Randy Dunlap 2550326ac7 backlight: fix 88pm860x_bl macro collision 
Fix collision with kernel-supplied #define:

  drivers/video/backlight/88pm860x_bl.c:24:1: warning: "CURRENT_MASK" redefined
  arch/x86/include/asm/page_64_types.h:6:1: warning: this is the location of the previous definition

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-01-20 17:02:06 -08:00
..
aty Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
backlight backlight: fix 88pm860x_bl macro collision 2011-01-20 17:02:06 -08:00
console kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
display
geode lxfb: Maintain video processor palette through suspend/resume 2010-12-01 18:18:56 +09:00
i810 drivers/video/i810/i810-i2c.c: fix i2c bus handling 2011-01-06 15:52:19 +09:00
intelfb i2c: Remove unneeded inclusions of <linux/i2c-id.h> 2010-10-24 18:16:58 +02:00
kyro
logo
matrox video: matroxfb: Correct video option in comments and kernel config help. 2011-01-11 12:11:16 +09:00
mb862xx
mbx
msm drivers/video/msm/mddi.c: Remove multiple KERN_<level> uses 2010-10-27 13:43:21 -07:00
nvidia backlight: constify backlight_ops 2010-11-16 14:14:02 +01:00
omap Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2011-01-07 16:58:04 -08:00
omap2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 2011-01-13 10:39:14 -08:00
pnx4008
riva Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
savage savagefb: fix DDC for Savage 4 2010-10-27 18:03:08 -07:00
sis sisfb: eliminate compiler warnings 2010-12-22 12:57:27 +09:00
vermilion
via Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 2010-11-10 12:04:41 +09:00
68328fb.c
acornfb.c
acornfb.h
amba-clcd.c
amifb.c
arcfb.c
arkfb.c
asiliantfb.c
atafb.c fbdev: atafb - Remove undead ifdef ATAFB_FALCON 2010-10-22 09:43:25 +02:00
atafb.h
atafb_iplan2p2.c
atafb_iplan2p4.c
atafb_iplan2p8.c
atafb_mfb.c
atafb_utils.h
atmel_lcdfb.c backlight: constify backlight_ops 2010-11-16 14:14:02 +01:00
au1100fb.c
au1100fb.h
au1200fb.c replace nested max/min macros with {max,min}3 macro 2010-10-26 16:52:12 -07:00
au1200fb.h
bf54x-lq043fb.c
bf537-lq035.c fbdev: bf537-lq035: new Blackfin Sharp LQ035 framebuffer driver 2010-11-26 15:06:34 +09:00
bfin-lq035q1-fb.c
bfin-t350mcqb-fb.c
bfin_adv7393fb.c fbdev: bfin_adv7393fb: new Blackfin ADV7393 driver 2010-11-26 15:06:39 +09:00
bfin_adv7393fb.h fbdev: bfin_adv7393fb: new Blackfin ADV7393 driver 2010-11-26 15:06:39 +09:00
broadsheetfb.c
bt431.h
bt455.h
bw2.c
c2p.h
c2p_core.h
c2p_iplan2.c
c2p_planar.c
carminefb.c drivers/video/carminefb.c: improve error handling 2011-01-06 15:46:56 +09: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
controlfb.c
controlfb.h
cyber2000fb.c
cyber2000fb.h
da8xx-fb.c video: da8xx: Register IRQ as last thing in driver probing. 2010-12-01 18:18:52 +09:00
dnfb.c
edid.h
efifb.c
ep93xx-fb.c ARM: 6616/1: Fix ep93xx-fb init/exit annotations 2011-01-11 12:26:58 +00:00
epson1355fb.c
fb_ddc.c
fb_defio.c workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync() 2010-12-15 10:56:11 +01:00
fb_draw.h
fb_notify.c
fb_sys_fops.c
fbcmap.c framebuffer: fix fbcmap.c kernel-doc warning 2010-11-26 15:05:08 +09:00
fbcvt.c
fbmem.c fb: fix overlapping test off-by-one. 2010-12-24 12:33:55 +09:00
fbmon.c fbdev: when parsing E-EDID blocks, also use SVD entries 2010-11-15 14:52:23 +09:00
fbsysfs.c
ffb.c
fm2fb.c
fsl-diu-fb.c
g364fb.c
gbefb.c drivers/video/gbefb.c: eliminate memory leak 2010-10-27 18:03:08 -07:00
gxt4500.c
hecubafb.c
hgafb.c video: Fix the HGA framebuffer driver 2011-01-06 15:48:13 +09:00
hitfb.c
hpfb.c
igafb.c
imsttfb.c
imxfb.c video: imx: Update the manufacturer's name 2011-01-12 15:06:59 +09:00
jz4740_fb.c
Kconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
leo.c
macfb.c
macmodes.c
macmodes.h
Makefile Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-01-06 16:50:35 -08:00
maxinefb.c
metronomefb.c
modedb.c video: tidy up modedb formatting. 2011-01-12 14:57:52 +09:00
mx3fb.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-12-22 12:56:10 +09:00
n411.c
neofb.c
nuc900fb.c nuc900fb: don't treat NULL clk as an error 2011-01-12 15:00:32 +09:00
nuc900fb.h
offb.c
output.c
p9100.c
platinumfb.c
platinumfb.h
pm2fb.c
pm3fb.c
pmag-aa-fb.c
pmag-ba-fb.c
pmagb-b-fb.c
ps3fb.c
pvr2fb.c
pxa3xx-gcu.c video: add driver for PXA3xx 2D graphics accelerator 2010-12-16 14:31:18 +08:00
pxa3xx-gcu.h video: add driver for PXA3xx 2D graphics accelerator 2010-12-16 14:31:18 +08:00
pxa168fb.c
pxa168fb.h
pxafb.c
pxafb.h
q40fb.c fbdev/m68k: Fix section mismatches in q40fb.c 2010-10-22 09:43:25 +02:00
s1d13xxxfb.c s1d13xxxfb: drop unused code 2010-12-21 01:05:43 +09:00
s3c-fb.c s3c-fb: add support for runtime pm 2010-12-21 01:05:43 +09:00
s3c2410fb.c s3c2410fb: don't treat NULL clk as an error 2011-01-12 15:00:31 +09:00
s3c2410fb.h
s3fb.c
sa1100fb.c
sa1100fb.h
sbuslib.c
sbuslib.h
sgivwfb.c
sh7760fb.c
sh_mipi_dsi.c fbdev: sh_mipi_dsi: use platform provided register layout and values 2011-01-05 17:22:32 +09:00
sh_mobile_hdmi.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 2011-01-13 10:39:14 -08:00
sh_mobile_lcdcfb.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 2011-01-06 18:27:34 +09:00
sh_mobile_lcdcfb.h
skeletonfb.c
sm501fb.c
sstfb.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
sticore.h
stifb.c
sunxvr500.c
sunxvr1000.c
sunxvr2500.c
svgalib.c
syscopyarea.c
sysfillrect.c
sysimgblt.c
tcx.c
tdfxfb.c
tgafb.c
tmiofb.c
tridentfb.c
udlfb.c Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
uvesafb.c
valkyriefb.c
valkyriefb.h
vesafb.c
vfb.c
vga16fb.c
vgastate.c
vt8500lcdfb.c fbdev: Implement simple blanking in pseudocolor modes for vt8500lcdfb 2011-01-13 13:07:41 +09:00
vt8500lcdfb.h ARM: Add support for the display controllers in VT8500 and WM8505 2010-11-09 18:52:07 +09:00
vt8623fb.c
w100fb.c
w100fb.h
wm8505fb.c fbdev: Modify vsync timing calculation in wm8505fb 2010-12-21 01:05:48 +09:00
wm8505fb_regs.h ARM: Add support for the display controllers in VT8500 and WM8505 2010-11-09 18:52:07 +09:00
wmt_ge_rops.c fbdev: Minor cleanup in WM8505-related code 2010-12-21 01:05:43 +09:00
wmt_ge_rops.h ARM: Add support for the display controllers in VT8500 and WM8505 2010-11-09 18:52:07 +09:00
xen-fbfront.c Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen 2011-01-10 08:48:46 -08:00
xilinxfb.c