Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[~andy/linux] / drivers / amba / bus.c

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index d31590e7011bf895092535d15af5df6cc2e62df5..2737b97522052e7a653eb9c7622132a07a6bcded 100644 (file)
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -298,7 +298,7 @@ int amba_device_register(struct amba_device *dev, struct resource *parent)
 
                amba_put_disable_pclk(dev);
 
-               if (cid == 0xb105f00d)
+               if (cid == AMBA_CID)
                        dev->periphid = pid;
 
                if (!dev->periphid)