update for 2009.11-rc2

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

CHANGES

@@ -1,3 +1,9 @@
+2009.11-rc2, Released November 29th, 2009:
+
+	Additional fixes and cleanups.
+
+	Updated/fixed packages: busybox, dbus, fltk, gvfs, ltrace
+
 2009.11-rc1, Released November 23rd, 2009:
 
 	Fixes all over the tree and new features.

Config.in

@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG
 
 config BR2_VERSION
 	string
-	default "2009.11-rc1"
+	default "2009.11-rc2"
 
 source "target/Config.in.arch"
 source "target/device/Config.in"

docs/buildroot.html

@@ -702,7 +702,7 @@ endif
      might be cumbersome.</p>
 
      <p>It is also possible to generate the Buildroot toolchain in
-     another directory than <code>build/staging</code> using the
+     another directory than <code>output/staging</code> using the
      <code>Build options -&gt; Toolchain and header file
      location</code> option. This could be useful if the toolchain
      must be shared with other users.</p>

docs/download.html

@@ -13,15 +13,15 @@ here:<p>
 or
 <a href="/downloads/buildroot-2009.08.tar.bz2">buildroot-2009.08.tar.bz2</a>.
 <p>
-<!--
-The latest release candidate is <b>2009.08-rc3</b>, which can be
+
+The latest release candidate is <b>2009.11-rc2</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2009.08-rc3.tar.gz">buildroot-2009.08-rc3.tar.gz</a>
+<a href="/downloads/buildroot-2009.11-rc2.tar.gz">buildroot-2009.11-rc2.tar.gz</a>
 or
-<a href="/downloads/buildroot-2009.08-rc3.tar.bz2">buildroot-2009.08-rc3.tar.bz2</a>.
+<a href="/downloads/buildroot-2009.11-rc2.tar.bz2">buildroot-2009.11-rc2.tar.bz2</a>.
 <p>
--->
+
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 

docs/news.html

@@ -5,6 +5,18 @@
 <p>
 
 <ul>
+  <li><b>29 November 2009 -- 2009.11-rc2 released</b>
+
+    <p>RC2 is out with more cleanups and bugfixes, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.11_rc2">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.11-rc2.tar.bz2">2009.11-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>23 November 2009 -- 2009.11-rc1 released</b>
 
     <p>We have a new release candidate! Lots of changes all over the

package/Config.in

@@ -139,7 +139,6 @@ source "package/ethtool/Config.in"
 source "package/haserl/Config.in"
 source "package/hostap/Config.in"
 source "package/ifplugd/Config.in"
-#source "package/irda-utils/Config.in"
 source "package/iperf/Config.in"
 source "package/iproute2/Config.in"
 source "package/ipsec-tools/Config.in"

package/busybox/busybox-1.15.2-flash-eraseall.patch

@@ -0,0 +1,104 @@
+From 86cfb70ca5f2bde11f2d071bc59db75291d8552f Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Fri, 27 Nov 2009 13:26:17 +0100
+Subject: [PATCH] flash_eraseall: stop using obsolete mtd/jffs2-user.h; code shrink
+
+function                                             old     new   delta
+show_progress                                         68      67      -1
+flash_eraseall_main                                 1007     882    -125
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-126)           Total: -126 bytes
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ miscutils/flash_eraseall.c |   47 ++++++++++++++++++++++++++++---------------
+ 1 files changed, 30 insertions(+), 17 deletions(-)
+
+diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
+index ba0a6b5..ca00a13 100644
+--- a/miscutils/flash_eraseall.c
++++ b/miscutils/flash_eraseall.c
+@@ -12,22 +12,35 @@
+ 
+ #include "libbb.h"
+ #include <mtd/mtd-user.h>
+-#include <mtd/jffs2-user.h>
++#include <linux/jffs2.h>
+ 
+ #define OPTION_J	(1 << 0)
+ #define OPTION_Q	(1 << 1)
+ #define IS_NAND		(1 << 2)
+ #define BBTEST		(1 << 3)
+ 
+-struct globals {
+-	/* This is used in the cpu_to_je/je_to_cpu macros in jffs2_user.h */
+-	int tgt_endian;
+-};
+-#define G (*(struct globals*)&bb_common_bufsiz1)
+-#define target_endian	(G.tgt_endian)
+-#define INIT_G() do { \
+-	target_endian = __BYTE_ORDER; \
+-} while (0)
++/* mtd/jffs2-user.h used to have this atrocity:
++extern int target_endian;
++
++#define t16(x) ({ __u16 __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); })
++#define t32(x) ({ __u32 __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); })
++
++#define cpu_to_je16(x) ((jint16_t){t16(x)})
++#define cpu_to_je32(x) ((jint32_t){t32(x)})
++#define cpu_to_jemode(x) ((jmode_t){t32(x)})
++
++#define je16_to_cpu(x) (t16((x).v16))
++#define je32_to_cpu(x) (t32((x).v32))
++#define jemode_to_cpu(x) (t32((x).m))
++
++but mtd/jffs2-user.h is gone now (at least 2.6.31.6 does not have it anymore)
++*/
++
++/* We always use native endianness */
++#undef cpu_to_je16
++#undef cpu_to_je32
++#define cpu_to_je16(v) ((jint16_t){(v)})
++#define cpu_to_je32(v) ((jint32_t){(v)})
+ 
+ static uint32_t crc32(uint32_t val, const void *ss, int len,
+ 		uint32_t *crc32_table)
+@@ -40,9 +53,11 @@ static uint32_t crc32(uint32_t val, const void *ss, int len,
+ 
+ static void show_progress(mtd_info_t *meminfo, erase_info_t *erase)
+ {
+-	printf("\rErasing %d Kibyte @ %x -- %2llu %% complete.",
+-		(unsigned)meminfo->erasesize / 1024, erase->start,
+-		(unsigned long long) erase->start * 100 / meminfo->size);
++	printf("\rErasing %u Kibyte @ %x - %2u%% complete.",
++		(unsigned)meminfo->erasesize / 1024,
++		erase->start,
++		(unsigned) ((unsigned long long) erase->start * 100 / meminfo->size)
++	);
+ 	fflush(stdout);
+ }
+ 
+@@ -57,17 +72,15 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
+ 	unsigned int flags;
+ 	char *mtd_name;
+ 
+-	INIT_G();
+ 	opt_complementary = "=1";
+ 	flags = BBTEST | getopt32(argv, "jq");
+ 
+ 	mtd_name = argv[optind];
+-	xstat(mtd_name, &st);
++	fd = xopen(mtd_name, O_RDWR);
++	fstat(fd, &st);
+ 	if (!S_ISCHR(st.st_mode))
+ 		bb_error_msg_and_die("%s: not a char device", mtd_name);
+ 
+-	fd = xopen(mtd_name, O_RDWR);
+-
+ 	xioctl(fd, MEMGETINFO, &meminfo);
+ 	erase.length = meminfo.erasesize;
+ 	if (meminfo.type == MTD_NANDFLASH)
+-- 
+1.6.5
+

package/busybox/busybox.mk

@@ -18,6 +18,7 @@ BUSYBOX_SITE:=http://www.busybox.net/downloads
 endif
 
 BUSYBOX_UNZIP=$(BZCAT)
+BUSYBOX_CFLAGS=$(TARGET_CFLAGS) -I$(LINUX_HEADERS_DIR)/include
 
 ifndef BUSYBOX_CONFIG_FILE
 BUSYBOX_CONFIG_FILE=$(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
@@ -100,13 +101,13 @@ $(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.config
 	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
 		ARCH=$(KERNEL_ARCH) \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)
+		EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR)
 ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy)
 	rm -f $@
 	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
 		ARCH=$(KERNEL_ARCH) STRIP="$(STRIPCMD)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) \
+		EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR) \
 		-f scripts/Makefile.IMA
 endif
 
@@ -115,7 +116,7 @@ ifeq ($(BR2_PACKAGE_BUSYBOX_FULLINSTALL),y)
 	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
 		ARCH=$(KERNEL_ARCH) \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) install
+		EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR) install
 else
 	install -D -m 0755 $(BUSYBOX_DIR)/busybox $(TARGET_DIR)/bin/busybox
 endif

package/dbus/dbus.mk

@@ -51,9 +51,9 @@ endif
 
 $(eval $(call AUTOTARGETS,package,dbus))
 
-# fix rebuild if /var/lib is a symlink to /tmp
+# fix rebuild (dbus makefile errors out if /var/lib/dbus is a symlink)
 $(DBUS_HOOK_POST_BUILD): $(DBUS_TARGET_BUILD)
-	rm -rf /tmp/dbus
+	rm -rf $(TARGET_DIR)/var/lib/dbus
 	touch $@
 
 $(DBUS_HOOK_POST_INSTALL): $(DBUS_TARGET_INSTALL_TARGET)

package/fltk/Config.in

@@ -1,8 +1,12 @@
 config BR2_PACKAGE_FLTK
 	bool "fltk"
+	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_PACKAGE_XORG7
 	help
 	  A cross-platform C++ GUI toolkit for UNIX/Linux (X11),
 	  Microsoft Windows, and MacOS X.
 
 	  http://www.fltk.org/
+
+comment "fltk requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP && BR2_PACKAGE_XORG7

package/gvfs/gvfs-1.2.2-libsoup-gnome.patch

@@ -1,7 +1,6 @@
-diff -ur gvfs-1.4.0-orig/configure gvfs-1.4.0/configure
---- gvfs-1.4.0-orig/configure	2009-09-21 16:33:27.000000000 +0200
-+++ gvfs-1.4.0/configure	2009-10-18 13:28:02.000000000 +0200
-@@ -17056,8 +17056,8 @@
+--- gvfs-1.2.2-orig/configure	2009-04-13 19:30:57.000000000 +0200
++++ gvfs-1.2.2/configure	2009-05-25 11:49:31.000000000 +0200
+@@ -25645,8 +25645,8 @@
  
  if test "x$enable_http" != "xno"; then
    if test -n "$PKG_CONFIG" && \
@@ -12,7 +11,7 @@ diff -ur gvfs-1.4.0-orig/configure gvfs-1.4.0/configure
    ac_status=$?
    $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -17074,12 +17074,12 @@
+@@ -25663,12 +25663,12 @@
      pkg_cv_HTTP_CFLAGS="$HTTP_CFLAGS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
@@ -28,7 +27,7 @@ diff -ur gvfs-1.4.0-orig/configure gvfs-1.4.0/configure
  else
    pkg_failed=yes
  fi
-@@ -17090,12 +17090,12 @@
+@@ -25679,12 +25679,12 @@
      pkg_cv_HTTP_LIBS="$HTTP_LIBS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
@@ -44,7 +43,7 @@ diff -ur gvfs-1.4.0-orig/configure gvfs-1.4.0/configure
  else
    pkg_failed=yes
  fi
-@@ -17113,14 +17113,14 @@
+@@ -25702,14 +25702,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -62,7 +61,7 @@ diff -ur gvfs-1.4.0-orig/configure gvfs-1.4.0/configure
  
  $HTTP_PKG_ERRORS
  
-@@ -17131,7 +17131,7 @@
+@@ -25720,7 +25720,7 @@
  and HTTP_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5
@@ -71,9 +70,8 @@ diff -ur gvfs-1.4.0-orig/configure gvfs-1.4.0/configure
  
  $HTTP_PKG_ERRORS
  
-diff -ur gvfs-1.4.0-orig/daemon/gvfsbackendhttp.c gvfs-1.4.0/daemon/gvfsbackendhttp.c
---- gvfs-1.4.0-orig/daemon/gvfsbackendhttp.c	2009-04-20 12:41:37.000000000 +0200
-+++ gvfs-1.4.0/daemon/gvfsbackendhttp.c	2009-10-18 13:28:02.000000000 +0200
+--- gvfs-1.2.2-orig/daemon/gvfsbackendhttp.c	2009-03-06 16:43:19.000000000 +0100
++++ gvfs-1.2.2/daemon/gvfsbackendhttp.c	2009-05-25 11:48:20.000000000 +0200
 @@ -33,7 +33,7 @@
  #include <glib/gi18n.h>
  #include <gio/gio.h>

package/gvfs/gvfs.mk

@@ -3,18 +3,18 @@
 # gvfs
 #
 #############################################################
-GVFS_VERSION_MAJOR = 1.4
-GVFS_VERSION_MINOR = 0
+GVFS_VERSION_MAJOR = 1.2
+GVFS_VERSION_MINOR = 2
 GVFS_VERSION = $(GVFS_VERSION_MAJOR).$(GVFS_VERSION_MINOR)
 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.gz
 GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
+
 GVFS_INSTALL_STAGING = NO
 GVFS_INSTALL_TARGET = YES
 GVFS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-GVFS_AUTORECONF = NO
-GVFS_LIBTOOL_PATCH = NO
 
-GVFS_DEPENDENCIES = uclibc host-pkgconfig host-libglib2 libglib2 dbus-glib shared-mime-info
+GVFS_AUTORECONF = NO
+GVFS_DEPENDENCIES = host-pkgconfig host-libglib2 libglib2 dbus-glib shared-mime-info
 
 GVFS_CONF_OPT = \
 	--disable-gconf			\

package/irda-utils/Config.in

@@ -1,45 +0,0 @@
-menuconfig BR2_PACKAGE_IRDA_UTILS
-	bool "irda_utils"
-	depends on BROKEN
-	help
-	  Tools for accessing the irda-Subsystem of the Linux-Kernel
-	  The makefile is totally broken.
-
-if BR2_PACKAGE_IRDA_UTILS
-config IRDA_IRATTACH
-	bool "irattach"
-	default y
-	help
-		To start the Irda-Subsystem in SIR-Mode you may need this
-
-config IRDA_IRDAPING
-	bool "irdaping"
-	help
-		what ping is for networks is irdaping for Irda
-
-config IRDA_IRNETD
-	bool "irnetd"
-	help
-		Needed for Networking over Irda
-
-config IRDA_IRDADUMP
-	bool "irdadump"
-	help
-		Like tcpdump, but for infrared connections
-
-config IRDA_FINDCHIP
-	bool "findchip"
-
-config IRDA_PSION
-	bool "support psion-dongle"
-
-config IRDA_TEKRAM
-	bool "support tekram-dongle"
-
-config IRDA_SMCINIT
-	bool "support toshiba-laptops"
-	help
-		Some Toshiba Laptops have buggy BIOSes which didn't initialize
-		Irda. This may help those.
-
-endif

package/irda-utils/irda-utils-0.9.18-install_irnetd.patch

@@ -1,12 +0,0 @@
-diff -Naur irda-utils-0.9.18.orig/irnetd/Makefile irda-utils-0.9.18/irnetd/Makefile
---- irda-utils-0.9.18.orig/irnetd/Makefile	2006-07-11 08:16:06.000000000 +0200
-+++ irda-utils-0.9.18/irnetd/Makefile	2007-06-08 20:39:25.000000000 +0200
-@@ -55,7 +55,7 @@
- 
- install: irnetd
- 	$(prn_install)
--	$(ECMD) install irnetd /usr/sbin/
-+	$(ECMD) install irnetd $(ROOT)/usr/sbin/
- 
- 
- clean:

package/irda-utils/irda.mk.broken

@@ -1,57 +0,0 @@
-#############################################################
-#
-# irda-utils
-#
-#############################################################
-IRDA_UTILS_VERSION:=0.9.18
-IRDA_UTILS_SOURCE:=irda-utils-$(IRDA_UTILS_VERSION).tar.gz
-IRDA_UTILS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/irda/$(IRDA_UTILS_SOURCE)
-IRDA_UTILS_DIR:=$(BUILD_DIR)/irda-utils-$(IRDA_UTILS_VERSION)
-
-ifeq ($(IRDA_IRATTACH),y)
-IRDA_DIRS += irattach
-endif
-ifeq ($(IRDA_IRDAPING),y)
-IRDA_DIRS += irdaping
-endif
-ifeq ($(IRDA_IRNETD),y)
-IRDA_DIRS += irnetd
-endif
-ifeq ($(IRDA_PSION),y)
-IRDA_DIRS += psion
-endif
-ifeq ($(IRDA_TEKRAM),y)
-IRDA_DIRS += tekram
-endif
-ifeq ($(IRDA_FINDCHIP),y)
-IRDA_DIRS += findchip
-endif
-ifeq ($(IRDA_IRDADUMP),y)
-IRDA_DIRS += irdadump
-endif
-ifeq ($(IRDA_SMCINIT),y)
-IRDA_DIRS += smcinit
-endif
-
-IRDA_UTILS_MAKE_OPT:=-e "DIRS=$(IRDA_DIRS)"
-IRDA_UTILS_MAKE_ENV:=CC=$(TARGET_CC) LD=$(TARGET_LD) AR=$(TARGET_AR) RANLIB=$(TARGET_RANLIB) ROOT=$(TARGET_DIR) PREFIX=$(TARGET_DIR)
-
-# Since there is no configure-script
-
-$(IRDA_UTILS_DIR)/.configured: $(IRDA_UTILS_DIR)/.patched
-	touch $@
-
-irda-utils: uclibc $(DL_DIR)/$(IRDA_UTILS_SOURCE) $(IRDA_UTILS_DIR)/.installed
-
-irda-utils-clean: $(IRDA_UTILS_DIR)/.clean
-
-irda-utils-dirclean: $(IRDA_UTILS_DIR)/.dirclean
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_IRDA_UTILS),y)
-TARGETS+=irda-utils
-endif

package/ltrace/Config.in

@@ -1,9 +1,6 @@
-comment "ltrace has no inherent support for AVR32" 
-	depends on BR2_avr32 && BR2_PACKAGE_LTRACE
-
 config BR2_PACKAGE_LTRACE
 	bool "ltrace"
-	#depends on BR2_LARGEFILE
+	depends on !(BR2_avr32 || BR2_cris || BR2_mips || BR2_mipsel || BR2_nios2 || BR2_sh || BR2_sh64 || BR2_xtensa)
 	select BR2_PACKAGE_LIBELF
 	help
 	  Debugging program which runs a specified command until it exits.

toolchain/kernel-headers/linux-2.6.31.6-scsi-use-__uX-types-for-headers-exported-to-user-space.patch

@@ -0,0 +1,89 @@
+From 5e0675efcec309617ba2d334c68ddb250ef942b2 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Fri, 27 Nov 2009 11:20:54 +0100
+Subject: [PATCH] scsi: use __uX types for headers exported to user space
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit 9e4f5e29 (FC Pass Thru support) exported a number of header files
+in include/scsi to user space, but didn't change the uX types to the
+userspace-compatible __uX types. Without that you'll get compile errors
+when including them - E.G.:
+
+/tmp/include/scsi/scsi.h:145: error: expected specifier-qualifier-list
+before ‘u8’
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ include/scsi/scsi.h         |    8 ++++----
+ include/scsi/scsi_netlink.h |   20 ++++++++++----------
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
+index 34c46ab..b3cffec 100644
+--- a/include/scsi/scsi.h
++++ b/include/scsi/scsi.h
+@@ -145,10 +145,10 @@ struct scsi_cmnd;
+ 
+ /* defined in T10 SCSI Primary Commands-2 (SPC2) */
+ struct scsi_varlen_cdb_hdr {
+-	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
+-	u8 control;
+-	u8 misc[5];
+-	u8 additional_cdb_length;         /* total cdb length - 8 */
++	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
++	__u8 control;
++	__u8 misc[5];
++	__u8 additional_cdb_length;         /* total cdb length - 8 */
+ 	__be16 service_action;
+ 	/* service specific data follows */
+ };
+diff --git a/include/scsi/scsi_netlink.h b/include/scsi/scsi_netlink.h
+index 536752c..7445c46 100644
+--- a/include/scsi/scsi_netlink.h
++++ b/include/scsi/scsi_netlink.h
+@@ -105,8 +105,8 @@ struct scsi_nl_host_vendor_msg {
+  *    PCI :  ID data is the 16 bit PCI Registered Vendor ID
+  */
+ #define SCSI_NL_VID_TYPE_SHIFT		56
+-#define SCSI_NL_VID_TYPE_MASK		((u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
+-#define SCSI_NL_VID_TYPE_PCI		((u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
++#define SCSI_NL_VID_TYPE_MASK		((__u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
++#define SCSI_NL_VID_TYPE_PCI		((__u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
+ #define SCSI_NL_VID_ID_MASK		(~ SCSI_NL_VID_TYPE_MASK)
+ 
+ 
+@@ -125,21 +125,21 @@ struct scsi_nl_host_vendor_msg {
+ #include <scsi/scsi_host.h>
+ 
+ /* Exported Kernel Interfaces */
+-int scsi_nl_add_transport(u8 tport,
++int scsi_nl_add_transport(__u8 tport,
+ 	 int (*msg_handler)(struct sk_buff *),
+ 	void (*event_handler)(struct notifier_block *, unsigned long, void *));
+-void scsi_nl_remove_transport(u8 tport);
++void scsi_nl_remove_transport(__u8 tport);
+ 
+-int scsi_nl_add_driver(u64 vendor_id, struct scsi_host_template *hostt,
++int scsi_nl_add_driver(__u64 vendor_id, struct scsi_host_template *hostt,
+ 	int (*nlmsg_handler)(struct Scsi_Host *shost, void *payload,
+-				 u32 len, u32 pid),
++				 __u32 len, __u32 pid),
+ 	void (*nlevt_handler)(struct notifier_block *nb,
+ 				 unsigned long event, void *notify_ptr));
+-void scsi_nl_remove_driver(u64 vendor_id);
++void scsi_nl_remove_driver(__u64 vendor_id);
+ 
+-void scsi_nl_send_transport_msg(u32 pid, struct scsi_nl_hdr *hdr);
+-int scsi_nl_send_vendor_msg(u32 pid, unsigned short host_no, u64 vendor_id,
+-			 char *data_buf, u32 data_len);
++void scsi_nl_send_transport_msg(__u32 pid, struct scsi_nl_hdr *hdr);
++int scsi_nl_send_vendor_msg(__u32 pid, unsigned short host_no, __u64 vendor_id,
++			 char *data_buf, __u32 data_len);
+ 
+ #endif /* __KERNEL__ */
+ 
+-- 
+1.6.5
+