#include <linux/device.h>
#include <linux/mutex.h>
-#include <asm/dma.h>
-#include <asm/arch/hardware.h>
+#include <mach/dma.h>
+#include <mach/hardware.h>
#include "ucb1x00.h"
ucb->dev.class = &ucb1x00_class;
ucb->dev.parent = &mcp->attached_device;
- strlcpy(ucb->dev.bus_id, "ucb1x00", sizeof(ucb->dev.bus_id));
+ dev_set_name(&ucb->dev, "ucb1x00");
spin_lock_init(&ucb->lock);
spin_lock_init(&ucb->io_lock);