diff options
| author | David Brown <davidb@codeaurora.org> | 2011-01-24 11:16:43 -0800 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-01-24 11:16:43 -0800 |
| commit | c243e5284371eb90af2c6771af60fa54c57513a4 (patch) | |
| tree | 92af7da349d2d02ce1d99fbf612dac3b74c6ea25 /arch/arm/mach-msm/devices-msm7x30.c | |
| parent | ba5499ebfb7bc7859039d782099c75d92c394016 (diff) | |
| parent | ec8f29e70edceb93c021148a99a5c3889cdc1b08 (diff) | |
Merge branch 'msm-uart' into for-next
* msm-uart:
serial: msm: Add support for UARTDM cores
msm: Add name field to UART resources
Diffstat (limited to 'arch/arm/mach-msm/devices-msm7x30.c')
| -rw-r--r-- | arch/arm/mach-msm/devices-msm7x30.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c index 4e9a0ab3e93..d4c7afccbdb 100644 --- a/arch/arm/mach-msm/devices-msm7x30.c +++ b/arch/arm/mach-msm/devices-msm7x30.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2008 Google, Inc. - * Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved. + * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -41,6 +41,7 @@ static struct resource resources_uart2[] = { .start = MSM_UART2_PHYS, .end = MSM_UART2_PHYS + MSM_UART2_SIZE - 1, .flags = IORESOURCE_MEM, + .name = "uart_resource" }, }; |