diff options
| -rw-r--r-- | common/lcd.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/soft_i2c.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/common/lcd.c b/common/lcd.c index d854c21..0555ab4 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -731,7 +731,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) bmap = (uchar *)bmp + le32_to_cpu (bmp->header.data_offset); fb = (uchar *) (lcd_base + - (y + height - 1) * lcd_line_length + x); + (y + height - 1) * lcd_line_length + x * bpix / 8); switch (bmp_bpix) { case 1: /* pass through */ diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c index 1a1809a..69b5f42 100644 --- a/drivers/i2c/soft_i2c.c +++ b/drivers/i2c/soft_i2c.c @@ -30,9 +30,7 @@ #include <ioports.h> #include <asm/io.h> #endif -#if defined(CONFIG_AT91RM9200) || \ - defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9261) || \ - defined(CONFIG_AT91SAM9263) +#if defined(CONFIG_AT91FAMILY) #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/at91_pio.h> |