diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-25 12:44:44 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-25 12:44:44 +0200 |
| commit | 76a9f26c9e40e9c0ed5dc8f0cedd74e733f0088d (patch) | |
| tree | 8e2db4ba9263e92d264ef469c7dac28078f63874 /include/asm-sparc64/fhc.h | |
| parent | nfs: remove nfs_put_link() (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-76a9f26c9e40e9c0ed5dc8f0cedd74e733f0088d.tar.xz linux-76a9f26c9e40e9c0ed5dc8f0cedd74e733f0088d.zip | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'include/asm-sparc64/fhc.h')
| -rw-r--r-- | include/asm-sparc64/fhc.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-sparc64/fhc.h b/include/asm-sparc64/fhc.h index f29eaa254055..9e7f1b0d78b9 100644 --- a/include/asm-sparc64/fhc.h +++ b/include/asm-sparc64/fhc.h @@ -10,6 +10,7 @@ #include <linux/timer.h> #include <asm/oplib.h> +#include <asm/prom.h> #include <asm/upa.h> struct linux_fhc; @@ -34,8 +35,7 @@ struct linux_central { unsigned long clkregs; unsigned long clkver; int slots; - int prom_node; - char prom_name[64]; + struct device_node *prom_node; struct linux_prom_ranges central_ranges[PROMREG_MAX]; int num_central_ranges; @@ -112,8 +112,7 @@ struct linux_fhc { struct fhc_regs fhc_regs; int board; int jtag_master; - int prom_node; - char prom_name[64]; + struct device_node *prom_node; struct linux_prom_ranges fhc_ranges[PROMREG_MAX]; int num_fhc_ranges; |