Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[sfrench/cifs-2.6.git] / arch / alpha / kernel / pci-noop.c

diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c
index ffbdb3fb672f6b6d6e4f23a5d47fc519fb07203e..676bab6e31235db014dc1d09d741b18bd8bb8dc4 100644 (file)
--- a/arch/alpha/kernel/pci-noop.c
+++ b/arch/alpha/kernel/pci-noop.c
@@ -42,11 +42,7 @@ alloc_pci_controller(void)
 struct resource * __init
 alloc_resource(void)
 {
-       struct resource *res;
-
-       res = alloc_bootmem(sizeof(*res));
-
-       return res;
+       return alloc_bootmem(sizeof(struct resource));
 }
 
 asmlinkage long