diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-02-03 17:12:42 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-02-03 17:13:05 -0500 |
| commit | 972c5ae961d6e5103e2b33d935cfa4145fd47140 (patch) | |
| tree | 350b2a76b979ba8766c09838617df67ff330eca0 /drivers/char/nwflash.c | |
| parent | 5196d20305d5e30d871111d3a876cf067dd94255 (diff) | |
| parent | 7c7ed8ec337bf5f62cc5287a6eb6b2f1b7504c2f (diff) | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply patch to a newer
code (namely drivers/gpu/drm/gma500/psb_intel_lvds.c)
Diffstat (limited to 'drivers/char/nwflash.c')
| -rw-r--r-- | drivers/char/nwflash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c index a12f52400dbc..bf586ae1ee83 100644 --- a/drivers/char/nwflash.c +++ b/drivers/char/nwflash.c | |||
| @@ -51,7 +51,7 @@ static int write_block(unsigned long p, const char __user *buf, int count); | |||
| 51 | #define KFLASH_ID 0x89A6 //Intel flash | 51 | #define KFLASH_ID 0x89A6 //Intel flash |
| 52 | #define KFLASH_ID4 0xB0D4 //Intel flash 4Meg | 52 | #define KFLASH_ID4 0xB0D4 //Intel flash 4Meg |
| 53 | 53 | ||
| 54 | static int flashdebug; //if set - we will display progress msgs | 54 | static bool flashdebug; //if set - we will display progress msgs |
| 55 | 55 | ||
| 56 | static int gbWriteEnable; | 56 | static int gbWriteEnable; |
| 57 | static int gbWriteBase64Enable; | 57 | static int gbWriteBase64Enable; |