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 /Documentation/arm/IXP4xx | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/arm/IXP4xx')
| -rw-r--r-- | Documentation/arm/IXP4xx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/arm/IXP4xx b/Documentation/arm/IXP4xx index 133c5fa6c7a1..7b9351f2f555 100644 --- a/Documentation/arm/IXP4xx +++ b/Documentation/arm/IXP4xx | |||
| @@ -36,7 +36,7 @@ Linux currently supports the following features on the IXP4xx chips: | |||
| 36 | - Timers (watchdog, OS) | 36 | - Timers (watchdog, OS) |
| 37 | 37 | ||
| 38 | The following components of the chips are not supported by Linux and | 38 | The following components of the chips are not supported by Linux and |
| 39 | require the use of Intel's propietary CSR softare: | 39 | require the use of Intel's proprietary CSR softare: |
| 40 | 40 | ||
| 41 | - USB device interface | 41 | - USB device interface |
| 42 | - Network interfaces (HSS, Utopia, NPEs, etc) | 42 | - Network interfaces (HSS, Utopia, NPEs, etc) |
| @@ -47,7 +47,7 @@ software from: | |||
| 47 | 47 | ||
| 48 | http://developer.intel.com/design/network/products/npfamily/ixp425.htm | 48 | http://developer.intel.com/design/network/products/npfamily/ixp425.htm |
| 49 | 49 | ||
| 50 | DO NOT POST QUESTIONS TO THE LINUX MAILING LISTS REGARDING THE PROPIETARY | 50 | DO NOT POST QUESTIONS TO THE LINUX MAILING LISTS REGARDING THE PROPRIETARY |
| 51 | SOFTWARE. | 51 | SOFTWARE. |
| 52 | 52 | ||
| 53 | There are several websites that provide directions/pointers on using | 53 | There are several websites that provide directions/pointers on using |