diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-15 14:31:12 -0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-15 14:31:12 -0200 |
| commit | fc21a2dd371806aed818e2ec0dfcb55dc7448a98 (patch) | |
| tree | 9107857e4a46feae6b09a400cbb127f72c7e35af /arch/blackfin/mach-bf527/boards/ezbrd.c | |
| parent | bc5b8a9003132ae44559edd63a1623b7b99dfb68 (diff) | |
| parent | 905905432868fa513f0f783fb9e5724536f4ee1f (diff) | |
| download | linux-fc21a2dd371806aed818e2ec0dfcb55dc7448a98.tar.gz linux-fc21a2dd371806aed818e2ec0dfcb55dc7448a98.tar.bz2 linux-fc21a2dd371806aed818e2ec0dfcb55dc7448a98.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin:
blackfin: Fixup export.h includes
Blackfin: add serial TX IRQ in individual platform resource
Diffstat (limited to 'arch/blackfin/mach-bf527/boards/ezbrd.c')
| -rw-r--r-- | arch/blackfin/mach-bf527/boards/ezbrd.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c index 64f7278aba53..9f792eafd1cc 100644 --- a/arch/blackfin/mach-bf527/boards/ezbrd.c +++ b/arch/blackfin/mach-bf527/boards/ezbrd.c @@ -7,6 +7,7 @@ */ #include <linux/device.h> +#include <linux/export.h> #include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> @@ -417,8 +418,13 @@ static struct resource bfin_uart0_resources[] = { .flags = IORESOURCE_MEM, }, { + .start = IRQ_UART0_TX, + .end = IRQ_UART0_TX, + .flags = IORESOURCE_IRQ, + }, + { .start = IRQ_UART0_RX, - .end = IRQ_UART0_RX+1, + .end = IRQ_UART0_RX, .flags = IORESOURCE_IRQ, }, { @@ -460,8 +466,13 @@ static struct resource bfin_uart1_resources[] = { .flags = IORESOURCE_MEM, }, { + .start = IRQ_UART1_TX, + .end = IRQ_UART1_TX, + .flags = IORESOURCE_IRQ, + }, + { .start = IRQ_UART1_RX, - .end = IRQ_UART1_RX+1, + .end = IRQ_UART1_RX, .flags = IORESOURCE_IRQ, }, { @@ -674,7 +685,6 @@ static struct platform_device bfin_sport1_uart_device = { #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) #include <linux/input.h> #include <linux/gpio_keys.h> -#include <linux/export.h> static struct gpio_keys_button bfin_gpio_keys_table[] = { {BTN_0, GPIO_PG0, 1, "gpio-keys: BTN0"}, |