From 711fa8096863e4b50bb97f9ebc44606dc2182ac3 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Tue, 3 Oct 2006 13:14:04 +0900 Subject: sh: build fixes for defconfigs. Get all of the defconfigs building again. Signed-off-by: Paul Mundt --- arch/sh/drivers/dma/dma-sysfs.c | 8 +++----- arch/sh/drivers/pci/ops-sh03.c | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'arch/sh/drivers') diff --git a/arch/sh/drivers/dma/dma-sysfs.c b/arch/sh/drivers/dma/dma-sysfs.c index 70a5d82eb2f..29b8ef9873d 100644 --- a/arch/sh/drivers/dma/dma-sysfs.c +++ b/arch/sh/drivers/dma/dma-sysfs.c @@ -48,12 +48,11 @@ static int __init dma_sysclass_init(void) int ret; ret = sysdev_class_register(&dma_sysclass); - if (ret == 0) - sysfs_create_file(&dma_sysclass.kset.kobj, &attr_devices.attr); + if (unlikely(ret)) + return ret; - return ret; + return sysfs_create_file(&dma_sysclass.kset.kobj, &attr_devices.attr); } - postcore_initcall(dma_sysclass_init); static ssize_t dma_show_dev_id(struct sys_device *dev, char *buf) @@ -152,4 +151,3 @@ void dma_remove_sysfs_files(struct dma_channel *chan, struct dma_info *info) sysdev_unregister(dev); } - diff --git a/arch/sh/drivers/pci/ops-sh03.c b/arch/sh/drivers/pci/ops-sh03.c index e58d556e5f9..ebb58e605d9 100644 --- a/arch/sh/drivers/pci/ops-sh03.c +++ b/arch/sh/drivers/pci/ops-sh03.c @@ -35,10 +35,10 @@ static struct resource sh7751_mem_resource = { .flags = IORESOURCE_MEM }; -extern struct pci_ops sh7751_pci_ops; +extern struct pci_ops sh4_pci_ops; struct pci_channel board_pci_channels[] = { - { &sh7751_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff }, + { &sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff }, { NULL, NULL, NULL, 0, 0 }, }; -- cgit v1.2.3