diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-06-12 19:26:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-06-12 19:26:49 +0100 |
| commit | 9bba618f18b1a60a3f2668db82b453f6cd9467c0 (patch) | |
| tree | 25f0ecb76346ccbe6331c8e38fd74a8b1f30be6f /include/chardev/char-parallel.h | |
| parent | 5093f028ce6529034efc8fdc06cec2aa2e2eea63 (diff) | |
| parent | 27d4c3789ddde40e1c7280150b46eb20a6a892e6 (diff) | |
Merge remote-tracking branch 'remotes/elmarco/tags/char-pull-request' into staging
# gpg: Signature made Thu 08 Jun 2017 15:12:11 BST
# gpg: using RSA key 0xDAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5
* remotes/elmarco/tags/char-pull-request:
test-char: start a /char/serial test
chardev: don't use alias names in parse_compat()
char: fix alias devices regression
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/chardev/char-parallel.h')
| -rw-r--r-- | include/chardev/char-parallel.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/chardev/char-parallel.h b/include/chardev/char-parallel.h index 3284a1b96b..c09751fd6c 100644 --- a/include/chardev/char-parallel.h +++ b/include/chardev/char-parallel.h @@ -26,11 +26,6 @@ #include "chardev/char.h" -#if defined(__linux__) || defined(__FreeBSD__) || \ - defined(__FreeBSD_kernel__) || defined(__DragonFly__) -#define HAVE_CHARDEV_PARPORT 1 -#endif - #define CHR_IOCTL_PP_READ_DATA 3 #define CHR_IOCTL_PP_WRITE_DATA 4 #define CHR_IOCTL_PP_READ_CONTROL 5 |