diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-26 14:01:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-26 14:01:57 -0700 |
| commit | dd41bf916609ae9d2d3ffbb56cfe0a6edd7d1e07 (patch) | |
| tree | f6e112d029e3c36c0b14bda77c6b315e1e340e8b | |
| parent | 70ab81c2ed3d1323e7d6805bf59cbb570dff7937 (diff) | |
| parent | 7edc24c4d1924e79d3853a8d7563bcce73f31e5d (diff) | |
| download | linux-3.10-dd41bf916609ae9d2d3ffbb56cfe0a6edd7d1e07.tar.gz linux-3.10-dd41bf916609ae9d2d3ffbb56cfe0a6edd7d1e07.tar.bz2 linux-3.10-dd41bf916609ae9d2d3ffbb56cfe0a6edd7d1e07.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
| -rw-r--r-- | arch/arm/mach-pxa/corgi_lcd.c | 2 | ||||
| -rw-r--r-- | include/asm-arm/bitops.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/corgi_lcd.c b/arch/arm/mach-pxa/corgi_lcd.c index 850538fadec..370df113dc0 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); diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h index aad7aad026b..e007dd990da 100644 --- a/include/asm-arm/bitops.h +++ b/include/asm-arm/bitops.h @@ -347,7 +347,6 @@ static inline unsigned long __ffs(unsigned long word) * the clz instruction for much better code efficiency. */ -static __inline__ int generic_fls(int x); #define fls(x) \ ( __builtin_constant_p(x) ? generic_fls(x) : \ ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) ) |