Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6] / include / asm-sparc64 / sbus.h

diff --git a/include/asm-sparc64/sbus.h b/include/asm-sparc64/sbus.h
index 56ee985e46050f9502336b78c2abe29c71813fa8..7efd49d31bb8a55a71f9ce9d07dcdf3a2a2e920f 100644 (file)
--- a/include/asm-sparc64/sbus.h
+++ b/include/asm-sparc64/sbus.h
@@ -80,7 +80,6 @@ struct sbus_bus {
        int num_sbus_ranges;
 
        int portid;
-       void *starfire_cookie;
 };
 #define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev)