projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arm-dt-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[linux-2.6-microblaze.git]
/
arch
/
arm
/
mach-pxa
/
hx4700.c
diff --git
a/arch/arm/mach-pxa/hx4700.c
b/arch/arm/mach-pxa/hx4700.c
index
2ae06ed
..
2fd6659
100644
(file)
--- a/
arch/arm/mach-pxa/hx4700.c
+++ b/
arch/arm/mach-pxa/hx4700.c
@@
-635,7
+635,7
@@
static struct pxa2xx_spi_controller pxa_ssp2_master_info = {
};
static struct gpiod_lookup_table pxa_ssp2_gpio_table = {
- .dev_id = "
pxa2xx-spi.
2",
+ .dev_id = "
spi
2",
.table = {
GPIO_LOOKUP_IDX("gpio-pxa", GPIO88_HX4700_TSC2046_CS, "cs", 0, GPIO_ACTIVE_LOW),
{ },