diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 04:36:09 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 04:36:09 -0500 |
commit | 668dfc7527eb755e1bf194bf19c0c281e9df6deb (patch) | |
tree | 2d9ba8e3ebbb7579f1af0493a9783f640ca86546 /arch/arm/plat-s3c64xx | |
parent | 9e157144afe81052f5abe122c2469e33a30d20a5 (diff) | |
parent | 22c810ab3e25d16e6f128384d107b933b6fd8fff (diff) |
ARM: Merge next-samsung-devupdates1
Merge branch 'next-samsung-devupdates1' into next-samsung-try7
Diffstat (limited to 'arch/arm/plat-s3c64xx')
-rw-r--r-- | arch/arm/plat-s3c64xx/dev-uart.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/arch/arm/plat-s3c64xx/dev-uart.c b/arch/arm/plat-s3c64xx/dev-uart.c index 62c11a6fc7ba..f797f748b999 100644 --- a/arch/arm/plat-s3c64xx/dev-uart.c +++ b/arch/arm/plat-s3c64xx/dev-uart.c | |||
@@ -145,32 +145,3 @@ struct s3c24xx_uart_resources s3c64xx_uart_resources[] __initdata = { | |||
145 | .nr_resources = ARRAY_SIZE(s3c64xx_uart3_resource), | 145 | .nr_resources = ARRAY_SIZE(s3c64xx_uart3_resource), |
146 | }, | 146 | }, |
147 | }; | 147 | }; |
148 | |||
149 | /* uart devices */ | ||
150 | |||
151 | static struct platform_device s3c24xx_uart_device0 = { | ||
152 | .id = 0, | ||
153 | }; | ||
154 | |||
155 | static struct platform_device s3c24xx_uart_device1 = { | ||
156 | .id = 1, | ||
157 | }; | ||
158 | |||
159 | static struct platform_device s3c24xx_uart_device2 = { | ||
160 | .id = 2, | ||
161 | }; | ||
162 | |||
163 | static struct platform_device s3c24xx_uart_device3 = { | ||
164 | .id = 3, | ||
165 | }; | ||
166 | |||
167 | struct platform_device *s3c24xx_uart_src[4] = { | ||
168 | &s3c24xx_uart_device0, | ||
169 | &s3c24xx_uart_device1, | ||
170 | &s3c24xx_uart_device2, | ||
171 | &s3c24xx_uart_device3, | ||
172 | }; | ||
173 | |||
174 | struct platform_device *s3c24xx_uart_devs[4] = { | ||
175 | }; | ||
176 | |||