diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-22 04:30:42 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-22 04:30:42 +0200 |
| commit | 08217637fe8a0ba24e1bfc893569f9be4d836c6a (patch) | |
| tree | aecd53ca7952b59d93f066161b677926e813a550 /include/video | |
| parent | [PATCH] sky2: driver update. (diff) | |
| parent | [PATCH] uml: fix compile warning after consolidation patch (diff) | |
| download | linux-08217637fe8a0ba24e1bfc893569f9be4d836c6a.tar.xz linux-08217637fe8a0ba24e1bfc893569f9be4d836c6a.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/pm3fb.h | 3 | ||||
| -rw-r--r-- | include/video/w100fb.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/video/pm3fb.h b/include/video/pm3fb.h index 8d3cef5d87a2..6f4ea808cf74 100644 --- a/include/video/pm3fb.h +++ b/include/video/pm3fb.h @@ -1142,9 +1142,6 @@ /* do we want accelerated console */ #define PM3FB_USE_ACCEL 1 -/* useful ? */ -#define CHAR_IS_NUM(a) ((((a) >= '0') && ((a) <= '9')) ? 1 : 0) - /* for driver debugging ONLY */ /* 0 = assert only, 1 = error, 2 = info, 3+ = verbose */ /* define PM3FB_MASTER_DEBUG 1 */ diff --git a/include/video/w100fb.h b/include/video/w100fb.h index e6da2d7ded8c..677d40326796 100644 --- a/include/video/w100fb.h +++ b/include/video/w100fb.h @@ -19,6 +19,7 @@ struct w100fb_par; unsigned long w100fb_gpio_read(int port); void w100fb_gpio_write(int port, unsigned long value); +unsigned long w100fb_get_hsynclen(struct device *dev); /* LCD Specific Routines and Config */ struct w100_tg_info { |