diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2014-11-20 14:42:02 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-11-20 14:42:02 +0100 |
| commit | a02001086bbfb4da35d1228bebc2f1b442db455f (patch) | |
| tree | 62ab47936cef06fd08657ca5b6cd1df98c19be57 /drivers/staging/xgifb/vb_setmode.c | |
| parent | kernel: trace: fix printk message (diff) | |
| parent | Linux 3.18-rc5 (diff) | |
| download | linux-dev-a02001086bbfb4da35d1228bebc2f1b442db455f.tar.xz linux-dev-a02001086bbfb4da35d1228bebc2f1b442db455f.zip | |
Merge Linus' tree to be be to apply submitted patches to newer code than
current trivial.git base
Diffstat (limited to 'drivers/staging/xgifb/vb_setmode.c')
| -rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 8795e173cb5a..d5f49d2a8db3 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -3895,8 +3895,7 @@ static struct XGI301C_Tap4TimingStruct const if (tempax <= tempbx) return &xgifb_tap4_timing[0]; - else - Tap4TimingPtr = xgifb_ntsc_525_tap4_timing; /* NTSC */ + Tap4TimingPtr = xgifb_ntsc_525_tap4_timing; /* NTSC */ if (pVBInfo->TVInfo & TVSetPAL) Tap4TimingPtr = PALTap4Timing; |