diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-08-28 15:56:11 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-28 15:56:11 +1000 |
| commit | 35438c4327df18dbf5e7f597b69299119f4a14de (patch) | |
| tree | a4589d731015db93f2eba8f84ffb1f48a8084020 /include/asm-sparc/sbus.h | |
| parent | 2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (diff) | |
| parent | b07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff) | |
| download | op-kernel-dev-35438c4327df18dbf5e7f597b69299119f4a14de.zip op-kernel-dev-35438c4327df18dbf5e7f597b69299119f4a14de.tar.gz | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'include/asm-sparc/sbus.h')
| -rw-r--r-- | include/asm-sparc/sbus.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc/sbus.h b/include/asm-sparc/sbus.h index d036e44..27d076c 100644 --- a/include/asm-sparc/sbus.h +++ b/include/asm-sparc/sbus.h @@ -68,7 +68,6 @@ struct sbus_dev { /* This struct describes the SBus(s) found on this machine. */ struct sbus_bus { struct of_device ofdev; - void *iommu; /* Opaque IOMMU cookie */ struct sbus_dev *devices; /* Link to devices on this SBus */ struct sbus_bus *next; /* next SBus, if more than one SBus */ int prom_node; /* PROM device tree node for this SBus */ |
