From dd0c93e0ebb2ded1e201494ef920903f038d584c Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Fri, 25 Nov 2005 16:41:33 +1100 Subject: [PATCH] --- yaml --- r: 14685 b: refs/heads/master c: 55b02d74e126df70fb6b92a0e4e4bed2f0a13fe4 h: refs/heads/master i: 14683: 42498282f530080c92e45775c93b130e17cbeab5 v: v3 --- [refs] | 2 +- trunk/drivers/video/fbmem.c | 6 +----- trunk/fs/xfs/xfs_iomap.h | 2 +- trunk/include/asm-arm/arch-iop3xx/timex.h | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 8d338902d997..744a11a2fd1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd0cca7bf5e201dcea5632f78ad9b37cb419a5df +refs/heads/master: 55b02d74e126df70fb6b92a0e4e4bed2f0a13fe4 diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c index 6240aedb4154..9f180096c896 100644 --- a/trunk/drivers/video/fbmem.c +++ b/trunk/drivers/video/fbmem.c @@ -452,17 +452,13 @@ int fb_prepare_logo(struct fb_info *info, int rotate) /* Return if no suitable logo was found */ fb_logo.logo = fb_find_logo(depth); - - if (!fb_logo.logo) { - return 0; - } if (rotate == FB_ROTATE_UR || rotate == FB_ROTATE_UD) yres = info->var.yres; else yres = info->var.xres; - if (fb_logo.logo->height > yres) { + if (fb_logo.logo && fb_logo.logo->height > yres) { fb_logo.logo = NULL; return 0; } diff --git a/trunk/fs/xfs/xfs_iomap.h b/trunk/fs/xfs/xfs_iomap.h index fcd6d63bb68b..3ce204a524b0 100644 --- a/trunk/fs/xfs/xfs_iomap.h +++ b/trunk/fs/xfs/xfs_iomap.h @@ -69,7 +69,7 @@ typedef struct xfs_iomap { xfs_buftarg_t *iomap_target; xfs_off_t iomap_offset; /* offset of mapping, bytes */ xfs_off_t iomap_bsize; /* size of mapping, bytes */ - size_t iomap_delta; /* offset into mapping, bytes */ + xfs_off_t iomap_delta; /* offset into mapping, bytes */ iomap_flags_t iomap_flags; } xfs_iomap_t; diff --git a/trunk/include/asm-arm/arch-iop3xx/timex.h b/trunk/include/asm-arm/arch-iop3xx/timex.h index 472badb451c4..d4187fe9a85a 100644 --- a/trunk/include/asm-arm/arch-iop3xx/timex.h +++ b/trunk/include/asm-arm/arch-iop3xx/timex.h @@ -4,7 +4,7 @@ * IOP3xx architecture timex specifications */ #include -#include + #if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244)