Commit fb0b5db6 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/sparc-2.6

into home.osdl.org:/home/torvalds/v2.5/linux
parents c4a6a7cf 465ba011
...@@ -379,6 +379,7 @@ CONFIG_MD_LINEAR=m ...@@ -379,6 +379,7 @@ CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m CONFIG_MD_RAID0=m
CONFIG_MD_RAID1=m CONFIG_MD_RAID1=m
CONFIG_MD_RAID5=m CONFIG_MD_RAID5=m
CONFIG_MD_RAID6=m
CONFIG_MD_MULTIPATH=m CONFIG_MD_MULTIPATH=m
CONFIG_BLK_DEV_DM=m CONFIG_BLK_DEV_DM=m
# CONFIG_DM_IOCTL_V4 is not set # CONFIG_DM_IOCTL_V4 is not set
...@@ -969,7 +970,7 @@ CONFIG_PHONE=m ...@@ -969,7 +970,7 @@ CONFIG_PHONE=m
CONFIG_PHONE_IXJ=m CONFIG_PHONE_IXJ=m
# #
# Unix 98 PTY support # Unix98 PTY support
# #
CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256 CONFIG_UNIX98_PTY_COUNT=256
...@@ -1054,16 +1055,21 @@ CONFIG_I2C_ALI1535=m ...@@ -1054,16 +1055,21 @@ CONFIG_I2C_ALI1535=m
CONFIG_I2C_ALI15X3=m CONFIG_I2C_ALI15X3=m
CONFIG_I2C_AMD756=m CONFIG_I2C_AMD756=m
CONFIG_I2C_AMD8111=m CONFIG_I2C_AMD8111=m
CONFIG_I2C_ELV=m
CONFIG_I2C_I801=m CONFIG_I2C_I801=m
CONFIG_I2C_I810=m CONFIG_I2C_I810=m
CONFIG_I2C_ISA=m
CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2=m
CONFIG_I2C_PHILIPSPAR=m CONFIG_I2C_PHILIPSPAR=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_PROSAVAGE=m CONFIG_I2C_PROSAVAGE=m
CONFIG_I2C_SAVAGE4=m CONFIG_I2C_SAVAGE4=m
CONFIG_SCx200_ACB=m CONFIG_SCx200_ACB=m
CONFIG_I2C_SIS5595=m CONFIG_I2C_SIS5595=m
CONFIG_I2C_SIS630=m CONFIG_I2C_SIS630=m
CONFIG_I2C_SIS96X=m CONFIG_I2C_SIS96X=m
CONFIG_I2C_VELLEMAN=m
CONFIG_I2C_VIA=m CONFIG_I2C_VIA=m
CONFIG_I2C_VIAPRO=m CONFIG_I2C_VIAPRO=m
CONFIG_I2C_VOODOO3=m CONFIG_I2C_VOODOO3=m
...@@ -1073,14 +1079,20 @@ CONFIG_I2C_VOODOO3=m ...@@ -1073,14 +1079,20 @@ CONFIG_I2C_VOODOO3=m
# #
CONFIG_I2C_SENSOR=m CONFIG_I2C_SENSOR=m
CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1021=m
CONFIG_SENSORS_ASB100=m
CONFIG_SENSORS_EEPROM=m CONFIG_SENSORS_EEPROM=m
CONFIG_SENSORS_IT87=m CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM75=m
CONFIG_SENSORS_LM78=m CONFIG_SENSORS_LM78=m
CONFIG_SENSORS_LM83=m CONFIG_SENSORS_LM83=m
CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM85=m
CONFIG_SENSORS_LM90=m
CONFIG_SENSORS_VIA686A=m CONFIG_SENSORS_VIA686A=m
CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83781D=m
CONFIG_SENSORS_W83L785TS=m
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_BUS is not set
# CONFIG_I2C_DEBUG_CHIP is not set
# #
# File systems # File systems
...@@ -1572,12 +1584,15 @@ CONFIG_USB_EZUSB=y ...@@ -1572,12 +1584,15 @@ CONFIG_USB_EZUSB=y
# #
# USB Miscellaneous drivers # USB Miscellaneous drivers
# #
CONFIG_USB_EMI62=m
CONFIG_USB_EMI26=m
# CONFIG_USB_TIGL is not set # CONFIG_USB_TIGL is not set
CONFIG_USB_AUERSWALD=m CONFIG_USB_AUERSWALD=m
CONFIG_USB_RIO500=m CONFIG_USB_RIO500=m
CONFIG_USB_LEGOTOWER=m CONFIG_USB_LEGOTOWER=m
# CONFIG_USB_BRLVGER is not set # CONFIG_USB_BRLVGER is not set
CONFIG_USB_LCD=m CONFIG_USB_LCD=m
CONFIG_USB_LED=m
CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_TEST=m CONFIG_USB_TEST=m
# CONFIG_USB_GADGET is not set # CONFIG_USB_GADGET is not set
......
...@@ -2023,6 +2023,7 @@ do_execve32(char * filename, u32 * argv, u32 * envp, struct pt_regs * regs) ...@@ -2023,6 +2023,7 @@ do_execve32(char * filename, u32 * argv, u32 * envp, struct pt_regs * regs)
security_bprm_free(&bprm); security_bprm_free(&bprm);
out_mm: out_mm:
if (bprm.mm)
mmdrop(bprm.mm); mmdrop(bprm.mm);
out_file: out_file:
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/version.h> #include <linux/version.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/init.h>
#include "dmxdev.h" #include "dmxdev.h"
#include "dvb_demux.h" #include "dvb_demux.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment