diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-26 23:01:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-26 23:01:57 +0200 |
| commit | dd41bf916609ae9d2d3ffbb56cfe0a6edd7d1e07 (patch) | |
| tree | f6e112d029e3c36c0b14bda77c6b315e1e340e8b /arch | |
| parent | posix cpu timers: fix timer ordering (diff) | |
| parent | [ARM] 3032/1: sparse: complains about generic_fls() prototype in asm-arm/bito... (diff) | |
| download | linux-dd41bf916609ae9d2d3ffbb56cfe0a6edd7d1e07.tar.xz linux-dd41bf916609ae9d2d3ffbb56cfe0a6edd7d1e07.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/corgi_lcd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/corgi_lcd.c b/arch/arm/mach-pxa/corgi_lcd.c index 850538fadece..370df113dc06 100644 --- a/arch/arm/mach-pxa/corgi_lcd.c +++ b/arch/arm/mach-pxa/corgi_lcd.c @@ -488,6 +488,7 @@ static int is_pxafb_device(struct device * dev, void * data) unsigned long spitz_get_hsync_len(void) { +#ifdef CONFIG_FB_PXA if (!spitz_pxafb_dev) { spitz_pxafb_dev = bus_find_device(&platform_bus_type, NULL, NULL, is_pxafb_device); if (!spitz_pxafb_dev) @@ -496,6 +497,7 @@ unsigned long spitz_get_hsync_len(void) if (!get_hsync_time) get_hsync_time = symbol_get(pxafb_get_hsync_time); if (!get_hsync_time) +#endif return 0; return pxafb_get_hsync_time(spitz_pxafb_dev); |