diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 21:26:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 21:26:12 -0700 |
| commit | 51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9 (patch) | |
| tree | 4bd5332323a26b020dfeac6eb2e77fba790aed2e /drivers | |
| parent | [PATCH] revert "kthread: convert stop_machine into a kthread" (diff) | |
| parent | kbuild: introduce utsrelease.h (diff) | |
| download | linux-dev-51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9.tar.xz linux-dev-51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
kbuild: introduce utsrelease.h
kbuild: explicit turn off gcc stack-protector
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c index b3ffcf501311..e386dcc32e8c 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c @@ -32,7 +32,7 @@ #include <linux/netdevice.h> #include <linux/pci.h> #include <linux/string.h> -#include <linux/version.h> +#include <linux/utsrelease.h> static void bcm43xx_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) |