Merge bk://kernel.bkbits.net/davem/net-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

arch/sparc64/defconfig

@@ -1146,7 +1146,7 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
 #
 CONFIG_BT_HCIUSB=m
 CONFIG_BT_USB_SCO=y
-CONFIG_BT_USB_ZERO_PACKET=y
+# CONFIG_BT_USB_ZERO_PACKET is not set
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y

arch/sparc64/oprofile/init.c

@@ -9,6 +9,7 @@
 
 #include <linux/kernel.h>
 #include <linux/oprofile.h>
+#include <linux/errno.h>
 #include <linux/init.h>
  
 extern void timer_init(struct oprofile_operations ** ops);

drivers/oprofile/timer_int.c

@@ -12,6 +12,8 @@
 #include <linux/smp.h>
 #include <linux/irq.h>
 #include <linux/oprofile.h>
+#include <linux/profile.h>
+#include <linux/init.h>
 #include <asm/ptrace.h>
  
 static int timer_notify(struct notifier_block * self, unsigned long val, void * data)