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/char/mwave/README | |
| 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/char/mwave/README')
| -rw-r--r-- | drivers/char/mwave/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/mwave/README b/drivers/char/mwave/README index 480251fc78e2..c2a58f428bc8 100644 --- a/drivers/char/mwave/README +++ b/drivers/char/mwave/README | |||
| @@ -11,7 +11,7 @@ are not saved by the BIOS and so do not persist after unload and reload. | |||
| 11 | 0x0008 tp3780i tracing | 11 | 0x0008 tp3780i tracing |
| 12 | 12 | ||
| 13 | Tracing only occurs if the driver has been compiled with the | 13 | Tracing only occurs if the driver has been compiled with the |
| 14 | MW_TRACE macro #defined (i.e. let EXTRA_CFLAGS += -DMW_TRACE | 14 | MW_TRACE macro #defined (i.e. let ccflags-y := -DMW_TRACE |
| 15 | in the Makefile). | 15 | in the Makefile). |
| 16 | 16 | ||
| 17 | mwave_3780i_irq=5/7/10/11/15 | 17 | mwave_3780i_irq=5/7/10/11/15 |