Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
David S. Miller [Thu, 24 Sep 2009 22:13:11 +0000 (15:13 -0700)]
Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/cpc-usb/TODO
drivers/staging/cpc-usb/cpc-usb_drv.c
drivers/staging/cpc-usb/cpc.h
drivers/staging/cpc-usb/cpc_int.h
drivers/staging/cpc-usb/cpcusb.h

1  2 
arch/arm/mach-at91/at91sam9263_devices.c
arch/arm/mach-at91/board-sam9263ek.c
arch/arm/mach-at91/include/mach/board.h
drivers/net/Kconfig
drivers/net/sky2.c
drivers/net/tun.c
drivers/staging/Kconfig
drivers/staging/Makefile
kernel/sys_ni.c
lib/vsprintf.c

@@@ -754,45 -754,9 +754,45 @@@ void __init at91_add_device_ac97(struc
        platform_device_register(&at91sam9263_ac97_device);
  }
  #else
- void __init at91_add_device_ac97(struct atmel_ac97_data *data) {}
+ void __init at91_add_device_ac97(struct ac97c_platform_data *data) {}
  #endif
  
 +/* --------------------------------------------------------------------
 + *  CAN Controller
 + * -------------------------------------------------------------------- */
 +
 +#if defined(CONFIG_CAN_AT91) || defined(CONFIG_CAN_AT91_MODULE)
 +static struct resource can_resources[] = {
 +      [0] = {
 +              .start  = AT91SAM9263_BASE_CAN,
 +              .end    = AT91SAM9263_BASE_CAN + SZ_16K - 1,
 +              .flags  = IORESOURCE_MEM,
 +      },
 +      [1] = {
 +              .start  = AT91SAM9263_ID_CAN,
 +              .end    = AT91SAM9263_ID_CAN,
 +              .flags  = IORESOURCE_IRQ,
 +      },
 +};
 +
 +static struct platform_device at91sam9263_can_device = {
 +      .name           = "at91_can",
 +      .id             = -1,
 +      .resource       = can_resources,
 +      .num_resources  = ARRAY_SIZE(can_resources),
 +};
 +
 +void __init at91_add_device_can(struct at91_can_data *data)
 +{
 +      at91_set_A_periph(AT91_PIN_PA13, 0);    /* CANTX */
 +      at91_set_A_periph(AT91_PIN_PA14, 0);    /* CANRX */
 +      at91sam9263_can_device.dev.platform_data = data;
 +
 +      platform_device_register(&at91sam9263_can_device);
 +}
 +#else
 +void __init at91_add_device_can(struct at91_can_data *data) {}
 +#endif
  
  /* --------------------------------------------------------------------
   *  LCD Controller
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -119,11 -111,27 +111,25 @@@ source "drivers/staging/octeon/Kconfig
  
  source "drivers/staging/serqt_usb2/Kconfig"
  
+ source "drivers/staging/quatech_usb2/Kconfig"
  source "drivers/staging/vt6655/Kconfig"
  
- source "drivers/staging/pata_rdc/Kconfig"
+ source "drivers/staging/vt6656/Kconfig"
  
 -source "drivers/staging/cpc-usb/Kconfig"
 -
  source "drivers/staging/udlfb/Kconfig"
  
+ source "drivers/staging/hv/Kconfig"
+ source "drivers/staging/vme/Kconfig"
+ source "drivers/staging/rar/Kconfig"
+ source "drivers/staging/sep/Kconfig"
+ source "drivers/staging/iio/Kconfig"
+ source "drivers/staging/cowloop/Kconfig"
  endif # !STAGING_EXCLUDE_BUILD
  endif # STAGING
@@@ -37,10 -34,17 +34,16 @@@ obj-$(CONFIG_STLC45XX)             += stlc45xx
  obj-$(CONFIG_B3DFG)           += b3dfg/
  obj-$(CONFIG_IDE_PHISON)      += phison/
  obj-$(CONFIG_PLAN9AUTH)               += p9auth/
- obj-$(CONFIG_HECI)            += heci/
  obj-$(CONFIG_LINE6_USB)               += line6/
  obj-$(CONFIG_USB_SERIAL_QUATECH2)     += serqt_usb2/
+ obj-$(CONFIG_USB_SERIAL_QUATECH_USB2) += quatech_usb2/
  obj-$(CONFIG_OCTEON_ETHERNET) += octeon/
  obj-$(CONFIG_VT6655)          += vt6655/
- obj-$(CONFIG_RDC_17F3101X)    += pata_rdc/
+ obj-$(CONFIG_VT6656)          += vt6656/
 -obj-$(CONFIG_USB_CPC)         += cpc-usb/
  obj-$(CONFIG_FB_UDL)          += udlfb/
+ obj-$(CONFIG_HYPERV)          += hv/
+ obj-$(CONFIG_VME_BUS)         += vme/
+ obj-$(CONFIG_RAR_REGISTER)    += rar/
+ obj-$(CONFIG_DX_SEP)          += sep/
+ obj-$(CONFIG_IIO)             += iio/
+ obj-$(CONFIG_COWLOOP)         += cowloop/
diff --cc kernel/sys_ni.c
Simple merge
diff --cc lib/vsprintf.c
Simple merge