diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /arch/cris | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index f848e3761491..e5979d68e352 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
| @@ -122,6 +122,8 @@ source arch/cris/arch-v10/Kconfig | |||
| 122 | 122 | ||
| 123 | endmenu | 123 | endmenu |
| 124 | 124 | ||
| 125 | source "net/Kconfig" | ||
| 126 | |||
| 125 | # bring in ETRAX built-in drivers | 127 | # bring in ETRAX built-in drivers |
| 126 | menu "Drivers for built-in interfaces" | 128 | menu "Drivers for built-in interfaces" |
| 127 | source arch/cris/arch-v10/drivers/Kconfig | 129 | source arch/cris/arch-v10/drivers/Kconfig |
| @@ -149,7 +151,7 @@ source "drivers/ieee1394/Kconfig" | |||
| 149 | 151 | ||
| 150 | source "drivers/message/i2o/Kconfig" | 152 | source "drivers/message/i2o/Kconfig" |
| 151 | 153 | ||
| 152 | source "net/Kconfig" | 154 | source "drivers/net/Kconfig" |
| 153 | 155 | ||
| 154 | source "drivers/isdn/Kconfig" | 156 | source "drivers/isdn/Kconfig" |
| 155 | 157 | ||