diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-30 15:42:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-30 15:42:33 -0700 |
| commit | 1d651f3332340c232ff66b7f5bab66cb8903859f (patch) | |
| tree | 99c47c498867ff5ee2fe0845622f4d1c4e1df1f4 /include | |
| parent | 49e7dc54cd4cbdb439ecc4e06214b0ca1a1a72b4 (diff) | |
| parent | 4774e2260cf25c54f2188dd0407676e3af6f1f23 (diff) | |
Merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-integrator/cm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/arch-integrator/cm.h b/include/asm-arm/arch-integrator/cm.h index d31c1a71f78..1ab353e2359 100644 --- a/include/asm-arm/arch-integrator/cm.h +++ b/include/asm-arm/arch-integrator/cm.h @@ -24,9 +24,9 @@ void cm_control(u32, u32); #define CM_CTRL_LCDBIASDN (1 << 10) #define CM_CTRL_LCDMUXSEL_MASK (7 << 11) #define CM_CTRL_LCDMUXSEL_GENLCD (1 << 11) -#define CM_CTRL_LCDMUXSEL_SHARPLCD1 (3 << 11) -#define CM_CTRL_LCDMUXSEL_SHARPLCD2 (4 << 11) -#define CM_CTRL_LCDMUXSEL_VGA (7 << 11) +#define CM_CTRL_LCDMUXSEL_VGA_16BPP (2 << 11) +#define CM_CTRL_LCDMUXSEL_SHARPLCD (3 << 11) +#define CM_CTRL_LCDMUXSEL_VGA_8421BPP (4 << 11) #define CM_CTRL_LCDEN0 (1 << 14) #define CM_CTRL_LCDEN1 (1 << 15) #define CM_CTRL_STATIC1 (1 << 16) |