git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
ia64
/
sn
/
kernel
/
xpnet.c
diff --git
a/arch/ia64/sn/kernel/xpnet.c
b/arch/ia64/sn/kernel/xpnet.c
index
78c13d6
..
007703c
100644
(file)
--- a/
arch/ia64/sn/kernel/xpnet.c
+++ b/
arch/ia64/sn/kernel/xpnet.c
@@
-22,7
+22,6
@@
*/
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/pci.h>
@@
-130,7
+129,7
@@
struct net_device *xpnet_device;
*/
static u64 xpnet_broadcast_partitions;
/* protect above */
*/
static u64 xpnet_broadcast_partitions;
/* protect above */
-static
spinlock_t xpnet_broadcast_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(xpnet_broadcast_lock)
;
/*
* Since the Block Transfer Engine (BTE) is being used for the transfer
/*
* Since the Block Transfer Engine (BTE) is being used for the transfer
@@
-636,6
+635,10
@@
xpnet_init(void)
int result = -ENOMEM;
int result = -ENOMEM;
+ if (!ia64_platform_is("sn2")) {
+ return -ENODEV;
+ }
+
dev_info(xpnet, "registering network device %s\n", XPNET_DEVICE_NAME);
/*
dev_info(xpnet, "registering network device %s\n", XPNET_DEVICE_NAME);
/*