aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps/ck804xrom.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-03-10 15:17:26 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-03-10 15:17:26 +0900
commite161183ba674f97fce748384f5bb037d07bdc5c9 (patch)
tree5b3bd4b995f6435ee977b71082244fa1a647f717 /drivers/mtd/maps/ck804xrom.c
parent2ef7f0dab6b3d171b6aff00a47077385ae3155b5 (diff)
parent99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff)
downloadkernel_samsung_smdk4412-e161183ba674f97fce748384f5bb037d07bdc5c9.tar.gz
kernel_samsung_smdk4412-e161183ba674f97fce748384f5bb037d07bdc5c9.tar.bz2
kernel_samsung_smdk4412-e161183ba674f97fce748384f5bb037d07bdc5c9.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd/maps/ck804xrom.c')
-rw-r--r--drivers/mtd/maps/ck804xrom.c2
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,