diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-30 12:16:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-30 12:16:26 +0200 |
| commit | 59293c8ad54726150cf6178164311b004d615ce4 (patch) | |
| tree | 6fcf8e59a2c9ac08a4ff092544c34d2254ac0d74 /include/asm-blackfin/mach-bf548/bf54x-lq043.h | |
| parent | 45f197ade73ba95681b9803680c75352fc0a1c0a (diff) | |
| parent | 94aca1dac6f6d21f4b07e4864baf7768cabcc6e7 (diff) | |
Merge commit 'v2.6.27-rc8' into oprofile
Conflicts:
arch/x86/oprofile/nmi_int.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-blackfin/mach-bf548/bf54x-lq043.h')
| -rw-r--r-- | include/asm-blackfin/mach-bf548/bf54x-lq043.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/include/asm-blackfin/mach-bf548/bf54x-lq043.h b/include/asm-blackfin/mach-bf548/bf54x-lq043.h deleted file mode 100644 index 9c7ca62a45eb..000000000000 --- a/include/asm-blackfin/mach-bf548/bf54x-lq043.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef BF54X_LQ043_H -#define BF54X_LQ043_H - -struct bfin_bf54xfb_val { - unsigned int defval; - unsigned int min; - unsigned int max; -}; - -struct bfin_bf54xfb_mach_info { - unsigned char fixed_syncs; /* do not update sync/border */ - - /* LCD types */ - int type; - - /* Screen size */ - int width; - int height; - - /* Screen info */ - struct bfin_bf54xfb_val xres; - struct bfin_bf54xfb_val yres; - struct bfin_bf54xfb_val bpp; - - /* GPIOs */ - unsigned short disp; - -}; - -#endif /* BF54X_LQ043_H */ |