projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mtd
/
nand
/
denali_pci.c
diff --git
a/drivers/mtd/nand/denali_pci.c
b/drivers/mtd/nand/denali_pci.c
index 033f177a6369b2d240b499f33df0b6bd925ed4d2..6e2f387b823f694e59e368bc987850a986c7d0c2 100644
(file)
--- a/
drivers/mtd/nand/denali_pci.c
+++ b/
drivers/mtd/nand/denali_pci.c
@@
-21,7
+21,7
@@
#define DENALI_NAND_NAME "denali-nand-pci"
/* List of platforms this NAND controller has be integrated into */
#define DENALI_NAND_NAME "denali-nand-pci"
/* List of platforms this NAND controller has be integrated into */
-static
DEFINE_PCI_DEVICE_TABLE(denali_pci_ids)
= {
+static
const struct pci_device_id denali_pci_ids[]
= {
{ PCI_VDEVICE(INTEL, 0x0701), INTEL_CE4100 },
{ PCI_VDEVICE(INTEL, 0x0809), INTEL_MRST },
{ /* end: all zeroes */ }
{ PCI_VDEVICE(INTEL, 0x0701), INTEL_CE4100 },
{ PCI_VDEVICE(INTEL, 0x0809), INTEL_MRST },
{ /* end: all zeroes */ }
@@
-131,7
+131,6
@@
static struct pci_driver denali_pci_driver = {
static int denali_init_pci(void)
{
static int denali_init_pci(void)
{
- pr_info("Spectra MTD driver built on %s @ %s\n", __DATE__, __TIME__);
return pci_register_driver(&denali_pci_driver);
}
module_init(denali_init_pci);
return pci_register_driver(&denali_pci_driver);
}
module_init(denali_init_pci);