diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-05 00:41:50 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-05 00:41:50 (GMT) |
| commit | 0ed06c7ee483f33e410033ae5cba1010c60522d4 (patch) | |
| tree | 3120e44094fa462708c0f366d63614001298be11 /drivers | |
| parent | 88c7da627569317f3d9256e8134bcbb38e7747dd (diff) | |
| parent | 7298b3052f74327748071f0a1f0ad9a0af254ca9 (diff) | |
| download | u-boot-0ed06c7ee483f33e410033ae5cba1010c60522d4.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/video/tegra124/display.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index ff2c370..275b29b 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -9,7 +9,7 @@ menuconfig PCI if PCI config DM_PCI - bool "Enable driver mode for PCI" + bool "Enable driver model for PCI" depends on DM help Use driver model for PCI. Driver model is the new method for diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c index d8999c3..28db96c 100644 --- a/drivers/video/tegra124/display.c +++ b/drivers/video/tegra124/display.c @@ -343,7 +343,7 @@ static int display_init(struct udevice *dev, void *lcdbase, /* * Before we probe the display device (eDP), tell it that this device - * is are the source of the display data. + * is the source of the display data. */ ret = uclass_find_first_device(UCLASS_DISPLAY, &dp_dev); if (ret) { |