diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-04 05:00:38 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-04 05:00:42 -0400 |
| commit | d7e57676e3ed7ab9b2c7c4bcb7873e51eacbdb84 (patch) | |
| tree | f7433f38cd407a0c35a8cbf2b7e3fd756087bce7 /arch/blackfin/mach-bf537/boards/stamp.c | |
| parent | feaa0457ec8351cae855edc9a3052ac49322538e (diff) | |
| parent | 746a99a5af60ee676afa2ba469ccd1373493c7e7 (diff) | |
Merge branch 'linus' into x86/cleanups
Merge reason: We were on an older pre-rc1 base, move to almost-rc2.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/stamp.c')
| -rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index ff7228caa7da..c1f76dd2c4ed 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
| @@ -79,7 +79,6 @@ static struct resource bfin_isp1760_resources[] = { | |||
| 79 | 79 | ||
| 80 | static struct isp1760_platform_data isp1760_priv = { | 80 | static struct isp1760_platform_data isp1760_priv = { |
| 81 | .is_isp1761 = 0, | 81 | .is_isp1761 = 0, |
| 82 | .port1_disable = 0, | ||
| 83 | .bus_width_16 = 1, | 82 | .bus_width_16 = 1, |
| 84 | .port1_otg = 0, | 83 | .port1_otg = 0, |
| 85 | .analog_oc = 0, | 84 | .analog_oc = 0, |