History

Merge master.kernel.org:/home/rmk/linux-2.6-arm

Linus Torvalds committed 21 years ago

Commit dd41bf92 parents 70ab81c 7edc24c2 files · +2 −1Browse files

Unified · Split

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