diff options
author | Magnus Damm <damm@igel.co.jp> | 2007-11-23 00:39:55 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-11-23 00:39:55 -0500 |
commit | 9a876d60a1cc1621708536b7f14e0f02c3e174ff (patch) | |
tree | 723cac7424a1d5ce57bf2ab936f077220faed353 /arch/sh | |
parent | 9b145b1be44b9094d2600502744cc986b1cbbcb5 (diff) |
sh: include ax88796 in the defconfig for r7785rp
This patch adds the ax88796 device driver to the r7785rp defconfig.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/configs/r7785rp_defconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sh/configs/r7785rp_defconfig b/arch/sh/configs/r7785rp_defconfig index 158e03f0b1ef..2e43a2a971a9 100644 --- a/arch/sh/configs/r7785rp_defconfig +++ b/arch/sh/configs/r7785rp_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.24-rc1 | 3 | # Linux kernel version: 2.6.24-rc2 |
4 | # Fri Nov 2 14:30:49 2007 | 4 | # Tue Nov 13 20:34:57 2007 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 7 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
@@ -124,8 +124,6 @@ CONFIG_CPU_SHX2=y | |||
124 | # CONFIG_CPU_SUBTYPE_SH7751R is not set | 124 | # CONFIG_CPU_SUBTYPE_SH7751R is not set |
125 | # CONFIG_CPU_SUBTYPE_SH7760 is not set | 125 | # CONFIG_CPU_SUBTYPE_SH7760 is not set |
126 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set | 126 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set |
127 | # CONFIG_CPU_SUBTYPE_ST40STB1 is not set | ||
128 | # CONFIG_CPU_SUBTYPE_ST40GX1 is not set | ||
129 | # CONFIG_CPU_SUBTYPE_SH7770 is not set | 127 | # CONFIG_CPU_SUBTYPE_SH7770 is not set |
130 | # CONFIG_CPU_SUBTYPE_SH7780 is not set | 128 | # CONFIG_CPU_SUBTYPE_SH7780 is not set |
131 | CONFIG_CPU_SUBTYPE_SH7785=y | 129 | CONFIG_CPU_SUBTYPE_SH7785=y |
@@ -254,7 +252,6 @@ CONFIG_GUSA=y | |||
254 | # | 252 | # |
255 | CONFIG_ZERO_PAGE_OFFSET=0x00001000 | 253 | CONFIG_ZERO_PAGE_OFFSET=0x00001000 |
256 | CONFIG_BOOT_LINK_OFFSET=0x00800000 | 254 | CONFIG_BOOT_LINK_OFFSET=0x00800000 |
257 | # CONFIG_UBC_WAKEUP is not set | ||
258 | CONFIG_CMDLINE_BOOL=y | 255 | CONFIG_CMDLINE_BOOL=y |
259 | CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1" | 256 | CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1" |
260 | 257 | ||
@@ -266,6 +263,7 @@ CONFIG_SH_PCIDMA_NONCOHERENT=y | |||
266 | CONFIG_PCI_AUTO=y | 263 | CONFIG_PCI_AUTO=y |
267 | CONFIG_PCI_AUTO_UPDATE_RESOURCES=y | 264 | CONFIG_PCI_AUTO_UPDATE_RESOURCES=y |
268 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 265 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
266 | CONFIG_PCI_LEGACY=y | ||
269 | # CONFIG_PCI_DEBUG is not set | 267 | # CONFIG_PCI_DEBUG is not set |
270 | # CONFIG_PCCARD is not set | 268 | # CONFIG_PCCARD is not set |
271 | # CONFIG_HOTPLUG_PCI is not set | 269 | # CONFIG_HOTPLUG_PCI is not set |
@@ -550,6 +548,8 @@ CONFIG_NETDEVICES=y | |||
550 | # CONFIG_PHYLIB is not set | 548 | # CONFIG_PHYLIB is not set |
551 | CONFIG_NET_ETHERNET=y | 549 | CONFIG_NET_ETHERNET=y |
552 | CONFIG_MII=y | 550 | CONFIG_MII=y |
551 | CONFIG_AX88796=y | ||
552 | CONFIG_AX88796_93CX6=y | ||
553 | # CONFIG_STNIC is not set | 553 | # CONFIG_STNIC is not set |
554 | # CONFIG_HAPPYMEAL is not set | 554 | # CONFIG_HAPPYMEAL is not set |
555 | # CONFIG_SUNGEM is not set | 555 | # CONFIG_SUNGEM is not set |