diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-25 16:20:10 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-25 16:20:10 -0400 |
| commit | 404e86e1550cc2c84bb57a372af784585c732f9a (patch) | |
| tree | c0e8e2d61c1b1c79705c0dc9f0f16e35267286e4 /include/linux/usb/midi.h | |
| parent | 0206e61b467fde4d7b50f1a64355182a4fd9576b (diff) | |
| parent | b9fa38f75ea7e1f64bc29653ca9758303ce698e4 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/usb/midi.h')
| -rw-r--r-- | include/linux/usb/midi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/midi.h b/include/linux/usb/midi.h index 80624c562921..1d1040865661 100644 --- a/include/linux/usb/midi.h +++ b/include/linux/usb/midi.h | |||
| @@ -109,4 +109,4 @@ struct usb_ms_endpoint_descriptor_##n { \ | |||
| 109 | __u8 baAssocJackID[n]; \ | 109 | __u8 baAssocJackID[n]; \ |
| 110 | } __attribute__ ((packed)) | 110 | } __attribute__ ((packed)) |
| 111 | 111 | ||
| 112 | #endif | 112 | #endif /* __LINUX_USB_MIDI_H */ |