diff options
Diffstat (limited to 'src/drivers')
-rw-r--r-- | src/drivers/ati/ragexl/atyfb.h | 8 | ||||
-rw-r--r-- | src/drivers/ati/ragexl/fbcon.h | 2 | ||||
-rw-r--r-- | src/drivers/emulation/qemu/fbcon.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/drivers/ati/ragexl/atyfb.h b/src/drivers/ati/ragexl/atyfb.h index 16eb15295d..a30cae48b3 100644 --- a/src/drivers/ati/ragexl/atyfb.h +++ b/src/drivers/ati/ragexl/atyfb.h @@ -223,7 +223,7 @@ static inline u32 aty_ld_le32(int regindex, if (regindex >= 0x400) regindex -= 0x800; -#ifdef CONFIG_ATARI +#ifdef ATARI return in_le32((volatile u32 *)(info->ati_regbase+regindex)); #else return readl (info->ati_regbase + regindex); @@ -237,7 +237,7 @@ static inline void aty_st_le32(int regindex, u32 val, if (regindex >= 0x400) regindex -= 0x800; -#ifdef CONFIG_ATARI +#ifdef ATARI out_le32 (info->ati_regbase+regindex, val); #else writel (val, info->ati_regbase + regindex); @@ -279,7 +279,7 @@ static inline u8 aty_ld_8(int regindex, if (regindex >= 0x400) regindex -= 0x800; -#ifdef CONFIG_ATARI +#ifdef ATARI return in_8 (info->ati_regbase + regindex); #else return readb (info->ati_regbase + regindex); @@ -293,7 +293,7 @@ static inline void aty_st_8(int regindex, u8 val, if (regindex >= 0x400) regindex -= 0x800; -#ifdef CONFIG_ATARI +#ifdef ATARI out_8 (info->ati_regbase + regindex, val); #else writeb (val, info->ati_regbase + regindex); diff --git a/src/drivers/ati/ragexl/fbcon.h b/src/drivers/ati/ragexl/fbcon.h index 56328323dc..8b83a3682b 100644 --- a/src/drivers/ati/ragexl/fbcon.h +++ b/src/drivers/ati/ragexl/fbcon.h @@ -65,7 +65,7 @@ struct display { #define fontheight(p) ((p)->_fontheight) #define fontheightlog(p) ((p)->_fontheightlog) -#ifdef CONFIG_FBCON_FONTWIDTH8_ONLY +#ifdef FBCON_FONTWIDTH8_ONLY /* fontwidth w is supported by dispsw */ #define FONTWIDTH(w) (1 << ((8) - 1)) diff --git a/src/drivers/emulation/qemu/fbcon.h b/src/drivers/emulation/qemu/fbcon.h index 56328323dc..8b83a3682b 100644 --- a/src/drivers/emulation/qemu/fbcon.h +++ b/src/drivers/emulation/qemu/fbcon.h @@ -65,7 +65,7 @@ struct display { #define fontheight(p) ((p)->_fontheight) #define fontheightlog(p) ((p)->_fontheightlog) -#ifdef CONFIG_FBCON_FONTWIDTH8_ONLY +#ifdef FBCON_FONTWIDTH8_ONLY /* fontwidth w is supported by dispsw */ #define FONTWIDTH(w) (1 << ((8) - 1)) |