diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /arch/arm/mach-s3c2410/mach-vr1000.c | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-vr1000.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-vr1000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c index 663a7f98fc0b..46b259673c18 100644 --- a/arch/arm/mach-s3c2410/mach-vr1000.c +++ b/arch/arm/mach-s3c2410/mach-vr1000.c | |||
| @@ -288,7 +288,7 @@ static struct resource vr1000_dm9k1_resource[] = { | |||
| 288 | * better IO routines can be written and tested | 288 | * better IO routines can be written and tested |
| 289 | */ | 289 | */ |
| 290 | 290 | ||
| 291 | struct dm9000_plat_data vr1000_dm9k_platdata = { | 291 | static struct dm9000_plat_data vr1000_dm9k_platdata = { |
| 292 | .flags = DM9000_PLATF_16BITONLY, | 292 | .flags = DM9000_PLATF_16BITONLY, |
| 293 | }; | 293 | }; |
| 294 | 294 | ||