Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4068b00e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6:
  avr32, exec: remove redundant set_fs(USER_DS)
  avr32: make intc_resume() return void to conform to syscore_ops
  avr32: add some more at91 to cpu.h definition
  avr32: set CONFIG_CC_OPTIMIZE_FOR_SIZE=y for all defconfigs
  avr32/at32ap: fix mapping of platform device id for USART
  avr32: fix use of non-existing portnr variable in at32_map_usart()
parents f39e8409 ff71db2f

arch/avr32/configs/atngw100_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y 
CONFIG_LOG_BUF_SHIFT=14

CONFIG_RELAY=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_BASE_FULL is not set

# CONFIG_COMPAT_BRK is not set

arch/avr32/configs/atngw100_evklcd100_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y 
CONFIG_LOG_BUF_SHIFT=14

CONFIG_RELAY=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_BASE_FULL is not set

# CONFIG_COMPAT_BRK is not set

arch/avr32/configs/atngw100_evklcd101_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y 
CONFIG_LOG_BUF_SHIFT=14

CONFIG_RELAY=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_BASE_FULL is not set

# CONFIG_COMPAT_BRK is not set

arch/avr32/configs/atngw100_mrmt_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y 
CONFIG_LOG_BUF_SHIFT=14

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_BASE_FULL is not set

# CONFIG_SLUB_DEBUG is not set

arch/avr32/configs/atngw100mkii_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y 
CONFIG_LOG_BUF_SHIFT=14

CONFIG_RELAY=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_BASE_FULL is not set

# CONFIG_COMPAT_BRK is not set