diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/usb/serial/garmin_gps.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/usb/serial/garmin_gps.c')
| -rw-r--r-- | drivers/usb/serial/garmin_gps.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c index 1f5d1620baa1..727852634be9 100644 --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/spinlock.h> | 35 | #include <linux/spinlock.h> |
| 36 | #include <asm/uaccess.h> | 36 | #include <asm/uaccess.h> |
| 37 | #include <linux/usb.h> | 37 | #include <linux/usb.h> |
| 38 | #include <linux/usb/serial.h> | ||
| 38 | 39 | ||
| 39 | /* the mode to be set when the port ist opened */ | 40 | /* the mode to be set when the port ist opened */ |
| 40 | static int initial_mode = 1; | 41 | static int initial_mode = 1; |
| @@ -42,8 +43,6 @@ static int initial_mode = 1; | |||
| 42 | /* debug flag */ | 43 | /* debug flag */ |
| 43 | static int debug = 0; | 44 | static int debug = 0; |
| 44 | 45 | ||
| 45 | #include "usb-serial.h" | ||
| 46 | |||
| 47 | #define GARMIN_VENDOR_ID 0x091E | 46 | #define GARMIN_VENDOR_ID 0x091E |
| 48 | 47 | ||
| 49 | /* | 48 | /* |