diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/irda/donauboe.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/irda/donauboe.h')
| -rw-r--r-- | drivers/net/irda/donauboe.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/irda/donauboe.h b/drivers/net/irda/donauboe.h index 36c3060411d2..d92d54e839b9 100644 --- a/drivers/net/irda/donauboe.h +++ b/drivers/net/irda/donauboe.h | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | * or the type-DO IR port. | 30 | * or the type-DO IR port. |
| 31 | * | 31 | * |
| 32 | * IrDA chip set list from Toshiba Computer Engineering Corp. | 32 | * IrDA chip set list from Toshiba Computer Engineering Corp. |
| 33 | * model method maker controler Version | 33 | * model method maker controller Version |
| 34 | * Portege 320CT FIR,SIR Toshiba Oboe(Triangle) | 34 | * Portege 320CT FIR,SIR Toshiba Oboe(Triangle) |
| 35 | * Portege 3010CT FIR,SIR Toshiba Oboe(Sydney) | 35 | * Portege 3010CT FIR,SIR Toshiba Oboe(Sydney) |
| 36 | * Portege 3015CT FIR,SIR Toshiba Oboe(Sydney) | 36 | * Portege 3015CT FIR,SIR Toshiba Oboe(Sydney) |
| @@ -51,10 +51,10 @@ | |||
| 51 | 51 | ||
| 52 | /* The documentation for this chip is allegedly released */ | 52 | /* The documentation for this chip is allegedly released */ |
| 53 | /* However I have not seen it, not have I managed to contact */ | 53 | /* However I have not seen it, not have I managed to contact */ |
| 54 | /* anyone who has. HOWEVER the chip bears a striking resemblence */ | 54 | /* anyone who has. HOWEVER the chip bears a striking resemblance */ |
| 55 | /* to the IrDA controller in the Toshiba RISC TMPR3922 chip */ | 55 | /* to the IrDA controller in the Toshiba RISC TMPR3922 chip */ |
| 56 | /* the documentation for this is freely available at */ | 56 | /* the documentation for this is freely available at */ |
| 57 | /* http://www.toshiba.com/taec/components/Generic/TMPR3922.shtml */ | 57 | /* http://www.madingley.org/james/resources/toshoboe/TMPR3922.pdf */ |
| 58 | /* The mapping between the registers in that document and the */ | 58 | /* The mapping between the registers in that document and the */ |
| 59 | /* Registers in the 701 oboe chip are as follows */ | 59 | /* Registers in the 701 oboe chip are as follows */ |
| 60 | 60 | ||