diff options
119 files changed, 907 insertions, 1294 deletions
diff --git a/arch/cris/arch-v10/drivers/eeprom.c b/arch/cris/arch-v10/drivers/eeprom.c index 1f2ae909d3e6..c3405507a3d1 100644 --- a/arch/cris/arch-v10/drivers/eeprom.c +++ b/arch/cris/arch-v10/drivers/eeprom.c | |||
| @@ -73,8 +73,7 @@ struct eeprom_type | |||
| 73 | int adapt_state; /* 1 = To high , 0 = Even, -1 = To low */ | 73 | int adapt_state; /* 1 = To high , 0 = Even, -1 = To low */ |
| 74 | 74 | ||
| 75 | /* this one is to keep the read/write operations atomic */ | 75 | /* this one is to keep the read/write operations atomic */ |
| 76 | wait_queue_head_t wait_q; | 76 | struct mutex lock; |
| 77 | volatile int busy; | ||
| 78 | int retry_cnt_addr; /* Used to keep track of number of retries for | 77 | int retry_cnt_addr; /* Used to keep track of number of retries for |
| 79 | adaptive timing adjustments */ | 78 | adaptive timing adjustments */ |
| 80 | int retry_cnt_read; | 79 | int retry_cnt_read; |
| @@ -115,8 +114,7 @@ const struct file_operations eeprom_fops = | |||
| 115 | 114 | ||
| 116 | int __init eeprom_init(void) | 115 | int __init eeprom_init(void) |
| 117 | { | 116 | { |