Unified · Split
| @@ -488,6 +488,7 @@ static int is_pxafb_device(struct device * dev, void * data) · 487 unmodified lines | ||
| 488 | 488 | |
| 489 | 489 | unsigned long spitz_get_hsync_len(void) |
| 490 | 490 | { |
| 491 | +#ifdef CONFIG_FB_PXA | |
| 491 | 492 | if (!spitz_pxafb_dev) { |
| 492 | 493 | spitz_pxafb_dev = bus_find_device(&platform_bus_type, NULL, NULL, is_pxafb_device); |
| 493 | 494 | if (!spitz_pxafb_dev) |
| @@ -496,6 +497,7 @@ unsigned long spitz_get_hsync_len(void) · 2 unmodified lines | ||
| 496 | 497 | if (!get_hsync_time) |
| 497 | 498 | get_hsync_time = symbol_get(pxafb_get_hsync_time); |
| 498 | 499 | if (!get_hsync_time) |
| 500 | +#endif | |
| 499 | 501 | return 0; |
| 500 | 502 | |
| 501 | 503 | return pxafb_get_hsync_time(spitz_pxafb_dev); |
| @@ -347,7 +347,6 @@ static inline unsigned long __ffs(unsigned long word) · 346 unmodified lines | ||
| 347 | 347 | * the clz instruction for much better code efficiency. |
| 348 | 348 | */ |
| 349 | 349 | |
| 350 | −static __inline__ int generic_fls(int x); | |
| 351 | 350 | #define fls(x) \ |
| 352 | 351 | ( __builtin_constant_p(x) ? generic_fls(x) : \ |
| 353 | 352 | ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) ) |