diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-04 11:58:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-04 11:58:14 -0500 |
| commit | 10be7eb36b93364b98688831ee7d26f58402bb96 (patch) | |
| tree | eb13ae80fcaa8baacd804a721c5a4962a501a2a4 /arch/powerpc/configs | |
| parent | 90c30335a70e96b8b8493b7deb15e6b30e6d9fce (diff) | |
| parent | 5ffaf8a361b4c9025963959a744f21d8173c7669 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'arch/powerpc/configs')
| -rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/ps3_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 7b3804a6e363..80e80caed2da 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
| @@ -1000,7 +1000,6 @@ CONFIG_TIGON3=y | |||
| 1000 | CONFIG_SPIDER_NET=m | 1000 | CONFIG_SPIDER_NET=m |
| 1001 | CONFIG_GELIC_NET=m | 1001 | CONFIG_GELIC_NET=m |
| 1002 | CONFIG_GELIC_WIRELESS=y | 1002 | CONFIG_GELIC_WIRELESS=y |
| 1003 | # CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE is not set | ||
| 1004 | # CONFIG_QLA3XXX is not set | 1003 | # CONFIG_QLA3XXX is not set |
| 1005 | # CONFIG_ATL1 is not set | 1004 | # CONFIG_ATL1 is not set |
| 1006 | # CONFIG_ATL1E is not set | 1005 | # CONFIG_ATL1E is not set |
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig index 7de127e4ceef..32f7058bb173 100644 --- a/arch/powerpc/configs/ps3_defconfig +++ b/arch/powerpc/configs/ps3_defconfig | |||
| @@ -593,7 +593,6 @@ CONFIG_MII=m | |||
| 593 | CONFIG_NETDEV_1000=y | 593 | CONFIG_NETDEV_1000=y |
| 594 | CONFIG_GELIC_NET=y | 594 | CONFIG_GELIC_NET=y |
| 595 | CONFIG_GELIC_WIRELESS=y | 595 | CONFIG_GELIC_WIRELESS=y |
| 596 | # CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE is not set | ||
| 597 | # CONFIG_NETDEV_10000 is not set | 596 | # CONFIG_NETDEV_10000 is not set |
| 598 | 597 | ||
| 599 | # | 598 | # |