diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:48:49 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:48:49 -0400 |
commit | 0fbbbf2bde4da5cb01a949c3d7b21c0627f520a8 (patch) | |
tree | f081ef10f3067b28a1ee316a8e7292eeda143419 /drivers/video/pxafb.h | |
parent | 54f00389563c80fa1de250a21256313ba01ca07d (diff) | |
parent | 2b235826098bb653982894dfc3f70fd029f6c2e4 (diff) |
Merge libata upstream (which includes C/H/S support) include irq-pio branch.
Merge branch 'upstream'
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 { #define PXA_NAME "PXA" /* - * Debug macros - */ -#if DEBUG -# define DPRINTK(fmt, args...) printk("%s: " fmt, __FUNCTION__ , ## args) -#else -# define DPRINTK(fmt, args...) -#endif - -/* * Minimum X and Y resolutions */ #define MIN_XRES 64 |