diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
| commit | 2ee73cc2d507df7b28050fba5d08bd33dd34848c (patch) | |
| tree | af5f33b265318e0f4b61f788691fe4f780ec402c /drivers/video/pxafb.h | |
| parent | c1d9728ecc5b560465df3c0c0d3b3825c2710b40 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/video/pxafb.h')
| -rw-r--r-- | drivers/video/pxafb.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/video/pxafb.h b/drivers/video/pxafb.h index 22c00be786a8..47f41f70db7a 100644 --- a/drivers/video/pxafb.h +++ b/drivers/video/pxafb.h | |||
| @@ -114,15 +114,6 @@ struct pxafb_info { | |||
| 114 | #define PXA_NAME "PXA" | 114 | #define PXA_NAME "PXA" |
| 115 | 115 | ||
| 116 | /* | 116 | /* |
| 117 | * Debug macros | ||
| 118 | */ | ||
| 119 | #if DEBUG | ||
| 120 | # define DPRINTK(fmt, args...) printk("%s: " fmt, __FUNCTION__ , ## args) | ||
| 121 | #else | ||
| 122 | # define DPRINTK(fmt, args...) | ||
| 123 | #endif | ||
| 124 | |||
| 125 | /* | ||
| 126 | * Minimum X and Y resolutions | 117 | * Minimum X and Y resolutions |
| 127 | */ | 118 | */ |
| 128 | #define MIN_XRES 64 | 119 | #define MIN_XRES 64 |