From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/ieee1394/hosts.c | 5 ----- ieee1394/sbp2.c | 0 2 files changed, 5 deletions(-) diff -puN drivers/ieee1394/hosts.c~git-ieee1394-fixup drivers/ieee1394/hosts.c --- a/drivers/ieee1394/hosts.c~git-ieee1394-fixup +++ a/drivers/ieee1394/hosts.c @@ -90,8 +90,6 @@ static int alloc_hostnum_cb(struct hpsb_ return 0; } -static DEFINE_MUTEX(host_num_alloc); - /** * hpsb_alloc_host - allocate a new host controller. * @drv: the driver that will manage the host controller @@ -107,7 +105,6 @@ static DEFINE_MUTEX(host_num_alloc); * Return Value: a pointer to the &hpsb_host if successful, %NULL if * no memory was available. */ -<<<<<<< HEAD/drivers/ieee1394/hosts.c static DEFINE_MUTEX(host_num_alloc); /* @@ -118,8 +115,6 @@ static DEFINE_MUTEX(host_num_alloc); */ static struct lock_class_key pending_packet_queue_key; -======= ->>>>>>> 3c6c65f5ed5a6d307bd607aecd06d658c0934d88/drivers/ieee1394/hosts.c struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra, struct device *dev) { diff -puN drivers/ieee1394/sbp2.c~git-ieee1394-fixup drivers/ieee1394/sbp2.c _