diff options
| author | Rod Whitby <rod@whitby.id.au> | 2008-02-28 00:53:50 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2008-02-28 00:53:50 +0000 |
| commit | 58c4c1107404f0a7451a475fb6dad76ec8ee7c3c (patch) | |
| tree | c2beb65c656ac74280ca124ae5e6c6d1bd3e9990 /packages | |
| parent | d6f7133b8d8e67069233aba56937fa4c6e41d196 (diff) | |
| parent | d1ea1190f2cadd8da3070c688554ee75c94f608c (diff) | |
merge of '630bb2aaaac174b3d70399ff3fc6fb3a647d53dd'
and 'ccc4dd4681cb7f6f34e0ac18322caee291ded94b'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/linux-ixp4xx/defconfig-2.6.24 | 2 | ||||
| -rw-r--r-- | packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 | 2 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.24 b/packages/linux/linux-ixp4xx/defconfig-2.6.24 index 9f13364281..790120452a 100644 --- a/packages/linux/linux-ixp4xx/defconfig-2.6.24 +++ b/packages/linux/linux-ixp4xx/defconfig-2.6.24 @@ -1244,7 +1244,7 @@ CONFIG_LEDS_TRIGGER_CPU_ACTIVITY=y # CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_V4L1 is not set -# CONFIG_VIDEO_V4L1_COMPAT is not set +CONFIG_VIDEO_V4L1_COMPAT is not set CONFIG_VIDEO_V4L2=y CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set diff --git a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 index 061c0c0724..0e14d09d11 100644 --- a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 +++ b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 @@ -1245,7 +1245,7 @@ CONFIG_LEDS_TRIGGER_CPU_ACTIVITY=y # CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_V4L1 is not set -# CONFIG_VIDEO_V4L1_COMPAT is not set +CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index b5d05c9203..adc0554fe4 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r47" +PR = "r48" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2|ixp4xx" @@ -190,6 +190,7 @@ SLUGOS_PACKAGES = "\ procps \ psmisc \ puppy \ + pvrusb2-mci \ python \ quilt \ reiserfsprogs reiser4progs \ @@ -255,7 +256,6 @@ SLUGOS_BROKEN_PACKAGES = "\ lirc-modules lirc \ madfu \ openldap \ - pvrusb2-mci \ pwc \ qc-usb-messenger \ syslog-ng \ |