diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 06:49:30 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 06:49:30 +0000 |
| commit | c94f28c383f58c9de74678e0f1624db9c5f8a8cb (patch) | |
| tree | 3281184f026cb79cee6c20fe29c994ba654cbbe4 /drivers/char/mxser.c | |
| parent | df15315899c0641412bd54b29565a70b078a6ac8 (diff) | |
| parent | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (diff) | |
| download | blackbird-op-linux-c94f28c383f58c9de74678e0f1624db9c5f8a8cb.tar.gz blackbird-op-linux-c94f28c383f58c9de74678e0f1624db9c5f8a8cb.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'drivers/char/mxser.c')
| -rw-r--r-- | drivers/char/mxser.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index 463df27494bd..dd9d75351cd6 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c @@ -303,6 +303,7 @@ static void mxser_enable_must_enchance_mode(unsigned long baseio) outb(oldlcr, baseio + UART_LCR); } +#ifdef CONFIG_PCI static void mxser_disable_must_enchance_mode(unsigned long baseio) { u8 oldlcr; @@ -317,6 +318,7 @@ static void mxser_disable_must_enchance_mode(unsigned long baseio) outb(efr, baseio + MOXA_MUST_EFR_REGISTER); outb(oldlcr, baseio + UART_LCR); } +#endif static void mxser_set_must_xon1_value(unsigned long baseio, u8 value) { @@ -388,6 +390,7 @@ static void mxser_set_must_enum_value(unsigned long baseio, u8 value) outb(oldlcr, baseio + UART_LCR); } +#ifdef CONFIG_PCI static void mxser_get_must_hardware_id(unsigned long baseio, u8 *pId) { u8 oldlcr; @@ -404,6 +407,7 @@ static void mxser_get_must_hardware_id(unsigned long baseio, u8 *pId) *pId = inb(baseio + MOXA_MUST_HWID_REGISTER); outb(oldlcr, baseio + UART_LCR); } +#endif static void SET_MOXA_MUST_NO_SOFTWARE_FLOW_CONTROL(unsigned long baseio) { |
