Merge to Fedora Core 2 kernel-2.6.8-1.521

[linux-2.6.git] / drivers / atm / firestream.c

diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 08fe300..91b85a9 100644 (file)
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1380,7 +1380,7 @@ static void __devinit *aligned_kmalloc (int size, int flags, int alignment)
 
        if (alignment <= 0x10) {
                t = kmalloc (size, flags);
-               if ((unsigned int)t & (alignment-1)) {
+               if ((unsigned long)t & (alignment-1)) {
                        printk ("Kmalloc doesn't align things correctly! %p\n", t);
                        kfree (t);
                        return aligned_kmalloc (size, flags, alignment * 4);