summaryrefslogtreecommitdiff
path: root/drivers/usb/serial/mxuport.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-10-02 16:42:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-10-02 16:42:28 -0700
commit7ec462100ef9142344ddbf86f2c3008b97acddbe (patch)
tree13336f4eb789467c9811987e964e4aaf5be0b4c8 /drivers/usb/serial/mxuport.c
parentf23aa4c0761a70bfd046dd5755281667f0769a94 (diff)
parent5f60d5f6bbc12e782fac78110b0ee62698f3b576 (diff)
downloadlwn-7ec462100ef9142344ddbf86f2c3008b97acddbe.tar.gz
lwn-7ec462100ef9142344ddbf86f2c3008b97acddbe.zip
Merge tag 'pull-work.unaligned' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull generic unaligned.h cleanups from Al Viro: "Get rid of architecture-specific <asm/unaligned.h> includes, replacing them with a single generic <linux/unaligned.h> header file. It's the second largest (after asm/io.h) class of asm/* includes, and all but two architectures actually end up using exact same file. Massage the remaining two (arc and parisc) to do the same and just move the thing to from asm-generic/unaligned.h to linux/unaligned.h" [ This is one of those things that we're better off doing outside the merge window, and would only cause extra conflict noise if it was in linux-next for the next release due to all the trivial #include line updates. Rip off the band-aid. - Linus ] * tag 'pull-work.unaligned' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: move asm/unaligned.h to linux/unaligned.h arc: get rid of private asm/unaligned.h parisc: get rid of private asm/unaligned.h
Diffstat (limited to 'drivers/usb/serial/mxuport.c')
-rw-r--r--drivers/usb/serial/mxuport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/mxuport.c b/drivers/usb/serial/mxuport.c
index 57e4f2b215d8..ad5fdf55a02e 100644
--- a/drivers/usb/serial/mxuport.c
+++ b/drivers/usb/serial/mxuport.c
@@ -25,7 +25,7 @@
#include <linux/uaccess.h>
#include <linux/usb.h>
#include <linux/usb/serial.h>
-#include <asm/unaligned.h>
+#include <linux/unaligned.h>
/* Definitions for the vendor ID and device ID */
#define MX_USBSERIAL_VID 0x110A