diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2005-07-20 17:36:56 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-20 17:36:56 +0000 |
| commit | fdade0602496c2aaad2fb011a124ac65fdb86278 (patch) | |
| tree | f8a97ffb9f85d04e18305bbb8dd623416cf80320 | |
| parent | 7c29f05b1ff45426aefb3c3fa250d8b0d0f78094 (diff) | |
| parent | ef1b1e31ebf2671c661b172749c0bb31370d2105 (diff) | |
merge of 6da8c85dc8bb8f2cd343e417a2e33cb7f19c1dda
and a073097d84a515599a3c0d13bd06d0e9cc9beded
| -rw-r--r-- | conf/machine/zaurus-clamshell-2.6.conf | 2 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 | 6 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.12-mm1.bb | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf index 3ce5924d04..7b6761b250 100644 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ b/conf/machine/zaurus-clamshell-2.6.conf @@ -27,8 +27,6 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel- # Infrared Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm kernel-module-ircomm-tty \ kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" -# PPP Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ppp-generic kernel-module-ppp-async" #USB Gadget Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \ diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 index 8e4712da4f..b6b7cbc17d 100644 --- a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 @@ -724,13 +724,13 @@ CONFIG_PCMCIA_PCNET=m # Wan interfaces # # CONFIG_WAN is not set -CONFIG_PPP=m +CONFIG_PPP=y # CONFIG_PPP_MULTILINK is not set # CONFIG_PPP_FILTER is not set -CONFIG_PPP_ASYNC=m +CONFIG_PPP_ASYNC=y # CONFIG_PPP_SYNC_TTY is not set # CONFIG_PPP_DEFLATE is not set -CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_BSDCOMP=y # CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set # CONFIG_SLIP is not set diff --git a/packages/linux/linux-openzaurus_2.6.12-mm1.bb b/packages/linux/linux-openzaurus_2.6.12-mm1.bb index fc519ecfbc..fe94202c9d 100644 --- a/packages/linux/linux-openzaurus_2.6.12-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.12-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r4" +PR = "r5" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" |