diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-02-20 20:13:40 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-02-20 20:13:40 +0100 |
| commit | 4f0cd56d89c94c36a26c9d8d5df77eac16f6cc2c (patch) | |
| tree | 3ce5f129ce9df0b6044f28f7bcbd366924573f3b /drivers/misc | |
| parent | 529907d16ca406a9a8ce1f9dae270fe5c198439a (diff) | |
| parent | 1d05f993784973189395051cc711fdd6dd5eb389 (diff) | |
| download | kernel_samsung_crespo-4f0cd56d89c94c36a26c9d8d5df77eac16f6cc2c.zip kernel_samsung_crespo-4f0cd56d89c94c36a26c9d8d5df77eac16f6cc2c.tar.gz kernel_samsung_crespo-4f0cd56d89c94c36a26c9d8d5df77eac16f6cc2c.tar.bz2 | |
Merge branch 'linux-3.0.y' into cm.ics.new
Conflicts:
mm/compaction.c
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/cb710/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/cb710/core.c b/drivers/misc/cb710/core.c index efec413..b1f16d6 100644 --- a/drivers/misc/cb710/core.c +++ b/drivers/misc/cb710/core.c @@ -244,6 +244,7 @@ static int __devinit cb710_probe(struct pci_dev *pdev, if (err) return err; + spin_lock_init(&chip->irq_lock); chip->pdev = pdev; chip->iobase = pcim_iomap_table(pdev)[0]; |