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/usb/serial/io_edgeport.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/usb/serial/io_edgeport.h')
| -rw-r--r-- | drivers/usb/serial/io_edgeport.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/io_edgeport.h b/drivers/usb/serial/io_edgeport.h index dced7ec65470..ad9c1d47a619 100644 --- a/drivers/usb/serial/io_edgeport.h +++ b/drivers/usb/serial/io_edgeport.h | |||
| @@ -68,7 +68,7 @@ struct comMapper { | |||
| 68 | #define PROC_SET_COM_ENTRY 2 | 68 | #define PROC_SET_COM_ENTRY 2 |
| 69 | 69 | ||
| 70 | 70 | ||
| 71 | /* The following sturcture is passed to the write */ | 71 | /* The following structure is passed to the write */ |
| 72 | struct procWrite { | 72 | struct procWrite { |
| 73 | int Command; | 73 | int Command; |
| 74 | union { | 74 | union { |