diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /drivers/usb/gadget/omap_udc.c | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/usb/gadget/omap_udc.c')
| -rw-r--r-- | drivers/usb/gadget/omap_udc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 2de9748ee673..0a64504c2545 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | #include <linux/platform_device.h> | 40 | #include <linux/platform_device.h> |
| 41 | #include <linux/usb_ch9.h> | 41 | #include <linux/usb_ch9.h> |
| 42 | #include <linux/usb_gadget.h> | 42 | #include <linux/usb_gadget.h> |
| 43 | #include <linux/usb_otg.h> | 43 | #include <linux/usb/otg.h> |
| 44 | #include <linux/dma-mapping.h> | 44 | #include <linux/dma-mapping.h> |
| 45 | 45 | ||
| 46 | #include <asm/byteorder.h> | 46 | #include <asm/byteorder.h> |
| @@ -2437,7 +2437,7 @@ static int proc_udc_open(struct inode *inode, struct file *file) | |||
| 2437 | return single_open(file, proc_udc_show, NULL); | 2437 | return single_open(file, proc_udc_show, NULL); |
| 2438 | } | 2438 | } |
| 2439 | 2439 | ||
| 2440 | static struct file_operations proc_ops = { | 2440 | static const struct file_operations proc_ops = { |
| 2441 | .open = proc_udc_open, | 2441 | .open = proc_udc_open, |
| 2442 | .read = seq_read, | 2442 | .read = seq_read, |
| 2443 | .llseek = seq_lseek, | 2443 | .llseek = seq_lseek, |