diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 15:32:56 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 15:32:56 (GMT) |
commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch) | |
tree | 50774592eaba942cf378fca731d307f901b737b7 /include/linux/serial_8250.h | |
parent | eb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (diff) | |
parent | 8576762ff5d109b841fcf4e7d3883e0cf794f3cf (diff) | |
download | linux-fsl-qoriq-4fd5f8267dd37aaebadfabe71d9c808821eea05a.tar.xz |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual #include fixups for clashes - there may be some unnecessary
Diffstat (limited to 'include/linux/serial_8250.h')
-rw-r--r-- | include/linux/serial_8250.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h index 317a979..2b799d4 100644 --- a/include/linux/serial_8250.h +++ b/include/linux/serial_8250.h @@ -12,7 +12,7 @@ #define _LINUX_SERIAL_8250_H #include <linux/serial_core.h> -#include <linux/device.h> +#include <linux/platform_device.h> /* * This is the platform device platform_data structure |