diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-13 12:45:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-13 12:45:50 -0700 |
| commit | 6142811a3395188bac6fa4f5c4223471b1ac98a8 (patch) | |
| tree | 76fa1cfd80eddfc7e529683685baebfd54f4096b /drivers/net | |
| parent | 49553c2ef88749dd502687f4eb9c258bb10a4f44 (diff) | |
| parent | 25c8e03bdb769dfe2381f8b7942f05b0eb4bdf31 (diff) | |
| download | linux-stable-6142811a3395188bac6fa4f5c4223471b1ac98a8.tar.gz linux-stable-6142811a3395188bac6fa4f5c4223471b1ac98a8.tar.bz2 linux-stable-6142811a3395188bac6fa4f5c4223471b1ac98a8.zip | |
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
spi/pl022: move probe call to subsys_initcall()
powerpc/5200: mpc52xx_uart.c: Add of_node_put to avoid memory leak
spi/pl022: fix APB pclk power regression on U300
spi/spi_s3c64xx: Warn if PIO transfers time out
spi/s3c64xx: Fix incorrect reuse of 'val' local variable.
spi/s3c64xx: Fix compilation warning
spi/dw_spi: clean the cs_control code
spi/dw_spi: Allow interrupt sharing
spi/spi_s3c64xx: Increase dead reckoning time in wait_for_xfer()
spi/spi_s3c64xx: Move to subsys_initcall()
spi: free children in spi_unregister_master, not siblings
gpiolib: Add 'struct gpio_chip' forward declaration for !GPIOLIB case
of: Fix missing includes - ll_temac
spi/spi_s3c64xx: Staticise non-exported functions
spi/spi_s3c64xx: Make probe more robust against missing board config
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ll_temac_main.c | 1 | ||||
| -rw-r--r-- | drivers/net/ll_temac_mdio.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index bdf2149e5296..87f0a93b165c 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c @@ -38,6 +38,7 @@ #include <linux/of_device.h> #include <linux/of_mdio.h> #include <linux/of_platform.h> +#include <linux/of_address.h> #include <linux/skbuff.h> #include <linux/spinlock.h> #include <linux/tcp.h> /* needed for sizeof(tcphdr) */ diff --git a/drivers/net/ll_temac_mdio.c b/drivers/net/ll_temac_mdio.c index 5ae28c975b38..8cf9d4f56bb2 100644 --- a/drivers/net/ll_temac_mdio.c +++ b/drivers/net/ll_temac_mdio.c @@ -10,6 +10,7 @@ #include <linux/phy.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/of_address.h> #include <linux/slab.h> #include <linux/of_mdio.h> |