Messages in this thread | | | Date | Tue, 20 May 2008 08:35:56 +0100 | From | Russell King <> | Subject | b4aa54d951d38d7a989d6b6385494ef5ea7371d7 breaks some serial configurations |
| |
The above commit contains the following patch:
| --- a/drivers/serial/8250.c | +++ b/drivers/serial/8250.c | @@ -43,6 +43,7 @@ | | #include <asm/io.h> | #include <asm/irq.h> | +#include <asm/serial.h> | | #include "8250.h" | | @@ -92,8 +93,6 @@ static unsigned int nr_uarts = CONFIG_SERIAL_8250_RUNTIME_UARTS; | */ | #define CONFIG_HUB6 1 | | -#include <asm/serial.h> | - | /* | * SERIAL_PORT_DFNS tells us about built-in ports that have no | * standard enumeration mechanism. Platforms that can find all
The code between these two hunks contains the following:
| #ifdef CONFIG_SERIAL_8250_DETECT_IRQ | #define CONFIG_SERIAL_DETECT_IRQ 1 | #endif | #ifdef CONFIG_SERIAL_8250_MANY_PORTS | #define CONFIG_SERIAL_MANY_PORTS 1 | #endif
and asm-*/serial.h contains:
| $ grep 'CONFIG_SERIAL_DETECT\|CONFIG_SERIAL_MANY' include/asm-*/serial.h | include/asm-alpha/serial.h:#ifdef CONFIG_SERIAL_DETECT_IRQ | include/asm-m68k/serial.h:#ifdef CONFIG_SERIAL_DETECT_IRQ | include/asm-mn10300/serial.h:#ifdef CONFIG_SERIAL_DETECT_IRQ | include/asm-mn10300/serial.h:#ifdef CONFIG_SERIAL_MANY_PORTS | include/asm-x86/serial.h:#ifdef CONFIG_SERIAL_DETECT_IRQ
So, all these ifdefs are now useless.
-- Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of:
| |