diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2013-08-09 13:00:39 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-08-09 13:00:39 +0930 |
| commit | 11489736177c5930514482b4db7af862d945335d (patch) | |
| tree | 8590ec4ba037b79c94982e15922fe50a1f0193a3 /arch/sh/configs | |
| parent | 3f0d0c9b47e09d47fcb755fed786a1ee88e110b5 (diff) | |
| parent | 6c2580c501c660fdfb506061e016d84570fceba1 (diff) | |
| download | op-kernel-dev-11489736177c5930514482b4db7af862d945335d.zip op-kernel-dev-11489736177c5930514482b4db7af862d945335d.tar.gz | |
Merge branch 'master' into virtio-next
The next commit gets conflicts because it relies on patches which were
cc:stable and thus had to be merged into Linus' tree before the coming
merge window. So pull in master now.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'arch/sh/configs')
| -rw-r--r-- | arch/sh/configs/sh03_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/configs/sh03_defconfig b/arch/sh/configs/sh03_defconfig index 2051821..0cf4097 100644 --- a/arch/sh/configs/sh03_defconfig +++ b/arch/sh/configs/sh03_defconfig @@ -22,7 +22,7 @@ CONFIG_PREEMPT=y CONFIG_CMDLINE_OVERWRITE=y CONFIG_CMDLINE="console=ttySC1,115200 mem=64M root=/dev/nfs" CONFIG_PCI=y -CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI=y CONFIG_BINFMT_MISC=y CONFIG_NET=y CONFIG_PACKET=y |
