diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 09:22:36 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 09:22:36 -0800 |
commit | 68a696a01f482859a9fe937249e8b3d44252b610 (patch) | |
tree | 42f2465a5f4ad008734ad45d61204d950ece7338 /arch/mips/dec/setup.c | |
parent | dcb92f8804717b845db70939b523c5d152a2e0ea (diff) | |
parent | f85da084151c9454891124c999006857a354622a (diff) | |
download | kernel_samsung_tuna-68a696a01f482859a9fe937249e8b3d44252b610.zip kernel_samsung_tuna-68a696a01f482859a9fe937249e8b3d44252b610.tar.gz kernel_samsung_tuna-68a696a01f482859a9fe937249e8b3d44252b610.tar.bz2 |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-tc
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-tc:
[EISA] EISA registration with !CONFIG_EISA
[TC] pmagb-b-fb: Convert to the driver model
[TC] dec_esp: Driver model for the PMAZ-A
[TC] mips: pmag-ba-fb: Convert to the driver model
[TC] defxx: TURBOchannel support
[TC] TURBOchannel support for the DECstation
[TC] MIPS: TURBOchannel resources off-by-one fix
[TC] MIPS: TURBOchannel update to the driver model
Diffstat (limited to 'arch/mips/dec/setup.c')
-rw-r--r-- | arch/mips/dec/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c index 1058e2f..b8a5e75 100644 --- a/arch/mips/dec/setup.c +++ b/arch/mips/dec/setup.c @@ -53,6 +53,8 @@ unsigned long dec_kn_slot_base, dec_kn_slot_size; EXPORT_SYMBOL(dec_kn_slot_base); EXPORT_SYMBOL(dec_kn_slot_size); +int dec_tc_bus; + spinlock_t ioasic_ssr_lock; volatile u32 *ioasic_base; |