diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-26 14:45:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-26 14:45:57 -0800 |
| commit | 221be177e68e197a946bb991c8b91468e960be4e (patch) | |
| tree | f77313df6358700d58cc7921551400170a8f6700 /drivers/mtd/maps/ck804xrom.c | |
| parent | d49981150387c481779a544ec641f17882f4bbfb (diff) | |
| parent | b50be33e42e2c87812b30aee1a2b2a5ac6cb3ffa (diff) | |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6:
[MTD] [MAPS] Remove MODULE_DEVICE_TABLE() from ck804rom driver.
[JFFS2] fix mount crash caused by removed nodes
[JFFS2] force the jffs2 GC daemon to behave a bit better
[MTD] [MAPS] blackfin async requires complex mappings
[MTD] [MAPS] blackfin: fix memory leak in error path
[MTD] [MAPS] physmap: fix wrong free and del_mtd_{partition,device}
[MTD] slram: Handle negative devlength correctly
[MTD] map_rom has NULL erase pointer
[MTD] [LPDDR] qinfo_probe depends on lpddr
Diffstat (limited to 'drivers/mtd/maps/ck804xrom.c')
| -rw-r--r-- | drivers/mtd/maps/ck804xrom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c index 5f7a245ed13..424f17d6ffd 100644 --- a/drivers/mtd/maps/ck804xrom.c +++ b/drivers/mtd/maps/ck804xrom.c @@ -342,9 +342,9 @@ static struct pci_device_id ck804xrom_pci_tbl[] = { { 0, } }; +#if 0 MODULE_DEVICE_TABLE(pci, ck804xrom_pci_tbl); -#if 0 static struct pci_driver ck804xrom_driver = { .name = MOD_NAME, .id_table = ck804xrom_pci_tbl, |