diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/arm/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/video/pxafb.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig index c37ee9e6b67b..39e1c0d39476 100644 --- a/drivers/net/arm/Kconfig +++ b/drivers/net/arm/Kconfig | |||
| @@ -68,6 +68,7 @@ config W90P910_ETH | |||
| 68 | tristate "Nuvoton w90p910 Ethernet support" | 68 | tristate "Nuvoton w90p910 Ethernet support" |
| 69 | depends on ARM && ARCH_W90X900 | 69 | depends on ARM && ARCH_W90X900 |
| 70 | select PHYLIB | 70 | select PHYLIB |
| 71 | select MII | ||
| 71 | help | 72 | help |
| 72 | Say Y here if you want to use built-in Ethernet ports | 73 | Say Y here if you want to use built-in Ethernet ports |
| 73 | on w90p910 processor. | 74 | on w90p910 processor. |
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 415858b421b3..825b665245bb 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
| @@ -1221,9 +1221,9 @@ static void setup_smart_timing(struct pxafb_info *fbi, | |||
| 1221 | static int pxafb_smart_thread(void *arg) | 1221 | static int pxafb_smart_thread(void *arg) |
| 1222 | { | 1222 | { |
| 1223 | struct pxafb_info *fbi = arg; | 1223 | struct pxafb_info *fbi = arg; |
| 1224 | struct pxafb_mach_info *inf; | 1224 | struct pxafb_mach_info *inf = fbi->dev->platform_data; |
| 1225 | 1225 | ||
| 1226 | if (!fbi || !fbi->dev->platform_data->smart_update) { | 1226 | if (!inf->smart_update) { |
| 1227 | pr_err("%s: not properly initialized, thread terminated\n", | 1227 | pr_err("%s: not properly initialized, thread terminated\n", |
| 1228 | __func__); | 1228 | __func__); |
| 1229 | return -EINVAL; | 1229 | return -EINVAL; |
