summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/hp4x.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-08-01 10:37:25 +1000
committerPaul Mackerras <paulus@samba.org>2006-08-01 10:37:25 +1000
commit57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch)
treee9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/usb/serial/hp4x.c
parentcb18bd40030c879cd93fef02fd579f74dbab473d (diff)
parent49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff)
downloadtalos-op-linux-57cad8084e0837e0f2c97da789ec9b3f36809be9.tar.gz
talos-op-linux-57cad8084e0837e0f2c97da789ec9b3f36809be9.zip
Merge branch 'merge'
Diffstat (limited to 'drivers/usb/serial/hp4x.c')
-rw-r--r--drivers/usb/serial/hp4x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c
index 7e06358b0310..ebcac701b069 100644
--- a/drivers/usb/serial/hp4x.c
+++ b/drivers/usb/serial/hp4x.c
@@ -17,7 +17,7 @@
#include <linux/tty.h>
#include <linux/module.h>
#include <linux/usb.h>
-#include "usb-serial.h"
+#include <linux/usb/serial.h>
/*
* Version Information
OpenPOWER on IntegriCloud