diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
| commit | 21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch) | |
| tree | e1be8645297f8ebe87445251743ebcc52081a20d /drivers/mtd/devices/m25p80.c | |
| parent | 34161db6b14d984fb9b06c735b7b42f8803f6851 (diff) | |
| parent | 68380b581383c028830f79ec2670f4a193854aa6 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Diffstat (limited to 'drivers/mtd/devices/m25p80.c')
| -rw-r--r-- | drivers/mtd/devices/m25p80.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index ef4a731ca5c2..334e078ffaff 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c | |||
| @@ -451,7 +451,7 @@ static int __devinit m25p_probe(struct spi_device *spi) | |||
| 451 | return -ENODEV; | 451 | return -ENODEV; |
| 452 | } | 452 | } |
| 453 | 453 | ||
| 454 | flash = kzalloc(sizeof *flash, SLAB_KERNEL); | 454 | flash = kzalloc(sizeof *flash, GFP_KERNEL); |
| 455 | if (!flash) | 455 | if (!flash) |
| 456 | return -ENOMEM; | 456 | return -ENOMEM; |
| 457 | 457 | ||