openwrt/staging/chunkeey.git
17 years agorefresh madwifi patches
Felix Fietkau [Fri, 13 Jul 2007 09:18:45 +0000 (09:18 +0000)]
refresh madwifi patches

SVN-Revision: 7961

17 years agomadwifi: patch for 'fixing' stuck beacons through card recalibration
Felix Fietkau [Fri, 13 Jul 2007 09:17:34 +0000 (09:17 +0000)]
madwifi: patch for 'fixing' stuck beacons through card recalibration

SVN-Revision: 7960

17 years agoclean up some leftover junk
Felix Fietkau [Fri, 13 Jul 2007 08:33:20 +0000 (08:33 +0000)]
clean up some leftover junk

SVN-Revision: 7959

17 years agofix madwifi unload/reload on SoC
Felix Fietkau [Fri, 13 Jul 2007 08:23:22 +0000 (08:23 +0000)]
fix madwifi unload/reload on SoC

SVN-Revision: 7958

17 years agofix monitor mode related crash in madwifi (#2034)
Felix Fietkau [Fri, 13 Jul 2007 07:24:43 +0000 (07:24 +0000)]
fix monitor mode related crash in madwifi (#2034)

SVN-Revision: 7957

17 years agofix unwanted automatic package cleaning when using quilt
Felix Fietkau [Fri, 13 Jul 2007 07:17:17 +0000 (07:17 +0000)]
fix unwanted automatic package cleaning when using quilt

SVN-Revision: 7956

17 years agomove firmware loading to hotplug2-init.rules (should fix #2056)
Felix Fietkau [Fri, 13 Jul 2007 02:32:32 +0000 (02:32 +0000)]
move firmware loading to hotplug2-init.rules (should fix #2056)

SVN-Revision: 7955

17 years agobusybox: Ensure that diff is available for ipkg upgrade requirements
Rod Whitby [Fri, 13 Jul 2007 01:02:55 +0000 (01:02 +0000)]
busybox: Ensure that diff is available for ipkg upgrade requirements

SVN-Revision: 7954

17 years agouse . /var/state/network instead of config_load to avoid a CONFIG_SECTIONS reset
Felix Fietkau [Fri, 13 Jul 2007 00:44:41 +0000 (00:44 +0000)]
use . /var/state/network instead of config_load to avoid a CONFIG_SECTIONS reset

SVN-Revision: 7953

17 years agoavoid a race condition that might lead to dnsmasq reading an empty resolv.conf (...
Felix Fietkau [Thu, 12 Jul 2007 21:59:38 +0000 (21:59 +0000)]
avoid a race condition that might lead to dnsmasq reading an empty resolv.conf (#2007)

SVN-Revision: 7952

17 years agofix layer7 for 2.6.21
Felix Fietkau [Thu, 12 Jul 2007 21:34:20 +0000 (21:34 +0000)]
fix layer7 for 2.6.21

SVN-Revision: 7951

17 years agofix static routes for dynamic interfaces (#1446)
Felix Fietkau [Thu, 12 Jul 2007 21:23:23 +0000 (21:23 +0000)]
fix static routes for dynamic interfaces (#1446)

SVN-Revision: 7949

17 years agoadd missing changes from #1949
Felix Fietkau [Thu, 12 Jul 2007 21:03:05 +0000 (21:03 +0000)]
add missing changes from #1949

SVN-Revision: 7948

17 years agoadd tpc change from #1949
Felix Fietkau [Thu, 12 Jul 2007 19:17:32 +0000 (19:17 +0000)]
add tpc change from #1949

SVN-Revision: 7947

17 years agomove to iptables 1.3.8
Tim Yardley [Thu, 12 Jul 2007 16:05:28 +0000 (16:05 +0000)]
move to iptables 1.3.8

SVN-Revision: 7946

17 years agoupgrade AVR32 to 2.6.22.1
Imre Kaloz [Thu, 12 Jul 2007 14:11:31 +0000 (14:11 +0000)]
upgrade AVR32 to 2.6.22.1

SVN-Revision: 7945

17 years agoupgrade dnsmasq (#1975)
Felix Fietkau [Thu, 12 Jul 2007 13:58:25 +0000 (13:58 +0000)]
upgrade dnsmasq (#1975)

SVN-Revision: 7944

17 years agoremove a hack that is no longer necessary
Felix Fietkau [Thu, 12 Jul 2007 13:43:59 +0000 (13:43 +0000)]
remove a hack that is no longer necessary

SVN-Revision: 7943

17 years agofix parallel build issues
Felix Fietkau [Thu, 12 Jul 2007 12:50:16 +0000 (12:50 +0000)]
fix parallel build issues

SVN-Revision: 7941

17 years agofix distclean
Felix Fietkau [Thu, 12 Jul 2007 10:55:00 +0000 (10:55 +0000)]
fix distclean

SVN-Revision: 7940

17 years agopci_module_init() is deprecated for a long time - this won't hurt .21 and will be...
Imre Kaloz [Thu, 12 Jul 2007 10:29:54 +0000 (10:29 +0000)]
pci_module_init() is deprecated for a long time - this won't hurt .21 and will be needed for .22

SVN-Revision: 7937

17 years agoupgrade atheros targets to 2.6.22.1
Imre Kaloz [Thu, 12 Jul 2007 10:19:36 +0000 (10:19 +0000)]
upgrade atheros targets to 2.6.22.1

SVN-Revision: 7936

17 years agosync with latest madwifi snapshot, refresh patches, add tpc fix by mdtaylor (should...
Felix Fietkau [Wed, 11 Jul 2007 21:13:50 +0000 (21:13 +0000)]
sync with latest madwifi snapshot, refresh patches, add tpc fix by mdtaylor (should fix #1949)

SVN-Revision: 7929

17 years agorename mini_fo mount point so as not to confuse users
Mike Baker [Wed, 11 Jul 2007 20:46:25 +0000 (20:46 +0000)]
rename mini_fo mount point so as not to confuse users

SVN-Revision: 7928

17 years agomove uci_load into config_load so that changes can be applied via uci without commiting
Mike Baker [Wed, 11 Jul 2007 20:39:28 +0000 (20:39 +0000)]
move uci_load into config_load so that changes can be applied via uci without commiting

SVN-Revision: 7927

17 years agofix detection of admboot based boards
Gabor Juhos [Wed, 11 Jul 2007 19:26:20 +0000 (19:26 +0000)]
fix detection of admboot based boards

SVN-Revision: 7926

17 years agofix ipset compilation
Tim Yardley [Wed, 11 Jul 2007 15:23:13 +0000 (15:23 +0000)]
fix ipset compilation

SVN-Revision: 7925

17 years agoremove hardware accelerated byte swapping feature, and resync kernel config
Gabor Juhos [Wed, 11 Jul 2007 15:21:17 +0000 (15:21 +0000)]
remove hardware accelerated byte swapping feature, and resync kernel config

SVN-Revision: 7924

17 years agoixp4xx: Add RTC driver for FSG-3
Rod Whitby [Wed, 11 Jul 2007 14:16:09 +0000 (14:16 +0000)]
ixp4xx: Add RTC driver for FSG-3

SVN-Revision: 7923

17 years agoarm-magic.sh: Added support for fsg3
Rod Whitby [Wed, 11 Jul 2007 14:07:28 +0000 (14:07 +0000)]
arm-magic.sh: Added support for fsg3

SVN-Revision: 7922

17 years agoixp4xx/fsg3: Compile needed drivers into the kernel to allow for booting directly...
Rod Whitby [Wed, 11 Jul 2007 13:51:34 +0000 (13:51 +0000)]
ixp4xx/fsg3: Compile needed drivers into the kernel to allow for booting directly from internal hard disk.

SVN-Revision: 7921

17 years agoixp4xx: Initial profile for the Freecom FSG-3
Rod Whitby [Wed, 11 Jul 2007 13:29:57 +0000 (13:29 +0000)]
ixp4xx: Initial profile for the Freecom FSG-3

SVN-Revision: 7920

17 years agoixp4xx: Add initial support for the Freecom FSG-3
Rod Whitby [Wed, 11 Jul 2007 13:16:14 +0000 (13:16 +0000)]
ixp4xx: Add initial support for the Freecom FSG-3

SVN-Revision: 7919

17 years agoixp4xx: Update from 2.6.21.5 to 2.6.21.6
Rod Whitby [Wed, 11 Jul 2007 13:15:25 +0000 (13:15 +0000)]
ixp4xx: Update from 2.6.21.5 to 2.6.21.6

SVN-Revision: 7918

17 years agomostly cosmetic sync with the mainline bubinga code
Imre Kaloz [Wed, 11 Jul 2007 13:13:26 +0000 (13:13 +0000)]
mostly cosmetic sync with the mainline bubinga code

SVN-Revision: 7917

17 years agorefactor kernel code (part 1), mark it as broken now
Gabor Juhos [Wed, 11 Jul 2007 13:00:27 +0000 (13:00 +0000)]
refactor kernel code (part 1), mark it as broken now

SVN-Revision: 7916

17 years agobump to 2.6.22.1
Mike Baker [Wed, 11 Jul 2007 10:57:49 +0000 (10:57 +0000)]
bump to 2.6.22.1

SVN-Revision: 7915

17 years agoadd ar7 2.6.22 patches by matteo (work in progress, not booting yet)
Felix Fietkau [Wed, 11 Jul 2007 10:47:25 +0000 (10:47 +0000)]
add ar7 2.6.22 patches by matteo (work in progress, not booting yet)

SVN-Revision: 7914

17 years agofix alsa snd_fops problem (#1426)
Felix Fietkau [Wed, 11 Jul 2007 10:19:29 +0000 (10:19 +0000)]
fix alsa snd_fops problem (#1426)

SVN-Revision: 7913

17 years agoreorganize netfilter modules, get rid of the iptables-mod-extra dependency in qos...
Felix Fietkau [Wed, 11 Jul 2007 06:47:33 +0000 (06:47 +0000)]
reorganize netfilter modules, get rid of the iptables-mod-extra dependency in qos-scripts

SVN-Revision: 7912

17 years agoremove a warning that has confused a few people
Felix Fietkau [Wed, 11 Jul 2007 06:15:50 +0000 (06:15 +0000)]
remove a warning that has confused a few people

SVN-Revision: 7911

17 years agofix cflags for xscale (#2026)
Felix Fietkau [Wed, 11 Jul 2007 05:18:19 +0000 (05:18 +0000)]
fix cflags for xscale (#2026)

SVN-Revision: 7910

17 years agocolor change to make menuconfig easier to read (patch from #1730)
Felix Fietkau [Wed, 11 Jul 2007 04:03:01 +0000 (04:03 +0000)]
color change to make menuconfig easier to read (patch from #1730)

SVN-Revision: 7909

17 years agofix a typo in the imq module (patch from #2005)
Felix Fietkau [Tue, 10 Jul 2007 20:42:26 +0000 (20:42 +0000)]
fix a typo in the imq module (patch from #2005)

SVN-Revision: 7908

17 years agofix PACKAGES:= for target profiles in target.mk
Felix Fietkau [Tue, 10 Jul 2007 20:36:25 +0000 (20:36 +0000)]
fix PACKAGES:= for target profiles in target.mk

SVN-Revision: 7907

17 years agofix a typo
Felix Fietkau [Tue, 10 Jul 2007 20:21:09 +0000 (20:21 +0000)]
fix a typo

SVN-Revision: 7906

17 years agofix docs compile targets
Felix Fietkau [Tue, 10 Jul 2007 16:38:05 +0000 (16:38 +0000)]
fix docs compile targets

SVN-Revision: 7905

17 years agofix errors in image generation Makefiles, thanks to Thomas Langer (fixes #2060)
Gabor Juhos [Tue, 10 Jul 2007 11:02:07 +0000 (11:02 +0000)]
fix errors in image generation Makefiles, thanks to Thomas Langer (fixes #2060)

SVN-Revision: 7904

17 years agofix channel/frequency returned by scan
Mike Baker [Mon, 9 Jul 2007 21:27:13 +0000 (21:27 +0000)]
fix channel/frequency returned by scan

SVN-Revision: 7903

17 years agodisable image generation for boards which we still have problems with (at least if...
Gabor Juhos [Mon, 9 Jul 2007 16:36:19 +0000 (16:36 +0000)]
disable image generation for boards which we still have problems with (at least if CONFIG_DEVEL is not selected)

SVN-Revision: 7902

17 years agorestart wds links when wifi is restarted
Mike Baker [Mon, 9 Jul 2007 16:11:21 +0000 (16:11 +0000)]
restart wds links when wifi is restarted

SVN-Revision: 7901

17 years agoau1000 now runs .22, mtx-1 watchdog is mainline and i2c patch is planned for rewriting
Florian Fainelli [Mon, 9 Jul 2007 16:06:43 +0000 (16:06 +0000)]
au1000 now runs .22, mtx-1 watchdog is mainline and i2c patch is planned for rewriting

SVN-Revision: 7900

17 years agoadd second package source for packages built from the /packages repository fix up...
Felix Fietkau [Mon, 9 Jul 2007 07:09:44 +0000 (07:09 +0000)]
add second package source for packages built from the /packages repository fix up first package source (should be release, not snapshots on 7.07)

SVN-Revision: 7897

17 years agofix the cpu_wait patch for 2.6.22
Felix Fietkau [Mon, 9 Jul 2007 05:44:15 +0000 (05:44 +0000)]
fix the cpu_wait patch for 2.6.22

SVN-Revision: 7896

17 years agoadd busybox printf patch from #2021
Felix Fietkau [Mon, 9 Jul 2007 03:05:18 +0000 (03:05 +0000)]
add busybox printf patch from #2021

SVN-Revision: 7895

17 years ago2.6.22 is released :)
Felix Fietkau [Mon, 9 Jul 2007 02:23:00 +0000 (02:23 +0000)]
2.6.22 is released :)

SVN-Revision: 7894

17 years agoremove ARCH:=i686 from s100 profile - the build system can't handle that properly yet
Felix Fietkau [Mon, 9 Jul 2007 00:19:13 +0000 (00:19 +0000)]
remove ARCH:=i686 from s100 profile - the build system can't handle that properly yet

SVN-Revision: 7893

17 years agohotplug2 update - include hotplug2-init.rules from hotplug2.rules, fix permissions...
Felix Fietkau [Mon, 9 Jul 2007 00:13:47 +0000 (00:13 +0000)]
hotplug2 update - include hotplug2-init.rules from hotplug2.rules, fix permissions of various devices (fixes #2052)

SVN-Revision: 7892

17 years agosome updates for s100
John Crispin [Sun, 8 Jul 2007 19:16:02 +0000 (19:16 +0000)]
some updates for s100

SVN-Revision: 7891

17 years agoadded i686 support and profile for t-vision s100
John Crispin [Sun, 8 Jul 2007 16:11:40 +0000 (16:11 +0000)]
added i686 support and profile for t-vision s100

SVN-Revision: 7890

17 years agofix usb-storage permissions
Mike Baker [Sun, 8 Jul 2007 13:23:17 +0000 (13:23 +0000)]
fix usb-storage permissions

SVN-Revision: 7889

17 years agomore wpa+wds patches
Mike Baker [Sun, 8 Jul 2007 12:51:30 +0000 (12:51 +0000)]
more wpa+wds patches

SVN-Revision: 7888

17 years agofix busybox --help problems on rebuild
Mike Baker [Sat, 7 Jul 2007 20:12:42 +0000 (20:12 +0000)]
fix busybox --help problems on rebuild

SVN-Revision: 7887

17 years agofix madwifi compile for 2.4
Felix Fietkau [Sat, 7 Jul 2007 09:29:15 +0000 (09:29 +0000)]
fix madwifi compile for 2.4

SVN-Revision: 7885

17 years agofix bug with ap+sta modes using wpa
Mike Baker [Wed, 4 Jul 2007 18:34:11 +0000 (18:34 +0000)]
fix bug with ap+sta modes using wpa

SVN-Revision: 7877

17 years agorearrange diag's platform detection code to look for known platform strings before...
Mike Baker [Wed, 4 Jul 2007 16:51:00 +0000 (16:51 +0000)]
rearrange diag's platform detection code to look for known platform strings before guessing

SVN-Revision: 7876

17 years agopatch wlc and scripts to control wl's builtin wpa supplicant
Mike Baker [Wed, 4 Jul 2007 16:49:08 +0000 (16:49 +0000)]
patch wlc and scripts to control wl's builtin wpa supplicant

SVN-Revision: 7875

17 years agoPackage the hardware clock utility and fix english typos (#2015)
Florian Fainelli [Wed, 4 Jul 2007 11:20:46 +0000 (11:20 +0000)]
Package the hardware clock utility and fix english typos (#2015)

SVN-Revision: 7874

17 years agoclean up default wifi config
Mike Baker [Wed, 4 Jul 2007 11:15:12 +0000 (11:15 +0000)]
clean up default wifi config

SVN-Revision: 7873

17 years agofix a race condition with broadcom wl devices in a bridge if a device is added before...
Felix Fietkau [Wed, 4 Jul 2007 05:05:46 +0000 (05:05 +0000)]
fix a race condition with broadcom wl devices in a bridge if a device is added before the bridge is brought up, the wifi settings are lost

SVN-Revision: 7872

17 years agoadd failsafe support for atheros-2.6 (#1501) - only works with ar5315+ at the moment
Felix Fietkau [Wed, 4 Jul 2007 04:35:44 +0000 (04:35 +0000)]
add failsafe support for atheros-2.6 (#1501) - only works with ar5315+ at the moment

SVN-Revision: 7870

17 years agorefactor atheros system code - also add support for the reset button (sends netlink...
Felix Fietkau [Wed, 4 Jul 2007 03:55:23 +0000 (03:55 +0000)]
refactor atheros system code - also add support for the reset button (sends netlink messages in the same format as broadcom-diag)

SVN-Revision: 7869

17 years agoremove ad-hoc tx hang workaround - the underlying issue has been fixed a while ago
Felix Fietkau [Wed, 4 Jul 2007 02:11:41 +0000 (02:11 +0000)]
remove ad-hoc tx hang workaround - the underlying issue has been fixed a while ago

SVN-Revision: 7868

17 years agoremove minstrel rate hack
Felix Fietkau [Wed, 4 Jul 2007 01:53:21 +0000 (01:53 +0000)]
remove minstrel rate hack

SVN-Revision: 7867

17 years agoanother madwifi update
Felix Fietkau [Wed, 4 Jul 2007 01:25:54 +0000 (01:25 +0000)]
another madwifi update

SVN-Revision: 7866

17 years agomore fixes for the crazy cpu cache issues on brcm47xx-2.6 (mainly affects 4704) ...
Felix Fietkau [Wed, 4 Jul 2007 00:48:59 +0000 (00:48 +0000)]
more fixes for the crazy cpu cache issues on brcm47xx-2.6 (mainly affects 4704) - turns out some of the previous fixes were incorrect and a coherency setup functions was missing

SVN-Revision: 7865

17 years agoupdate to the latest madwifi snapshot
Felix Fietkau [Tue, 3 Jul 2007 21:03:58 +0000 (21:03 +0000)]
update to the latest madwifi snapshot

SVN-Revision: 7864

17 years agomore generic handling of Macronix flash chips, fix #2008
Gabor Juhos [Tue, 3 Jul 2007 17:04:46 +0000 (17:04 +0000)]
more generic handling of Macronix flash chips, fix #2008

SVN-Revision: 7863

17 years agofix util-linux compile on avr32
Felix Fietkau [Tue, 3 Jul 2007 01:13:10 +0000 (01:13 +0000)]
fix util-linux compile on avr32

SVN-Revision: 7860

17 years agowds-wpa support
Mike Baker [Mon, 2 Jul 2007 22:58:11 +0000 (22:58 +0000)]
wds-wpa support

SVN-Revision: 7858

17 years agorefresh a patch that is causing problems on certain systems
Felix Fietkau [Mon, 2 Jul 2007 21:52:32 +0000 (21:52 +0000)]
refresh a patch that is causing problems on certain systems

SVN-Revision: 7857

17 years agofix a glitch in the status output of the non-verbose builds for adm5120
Felix Fietkau [Mon, 2 Jul 2007 19:10:14 +0000 (19:10 +0000)]
fix a glitch in the status output of the non-verbose builds for adm5120

SVN-Revision: 7856

17 years agofix sdk build
Felix Fietkau [Mon, 2 Jul 2007 18:36:31 +0000 (18:36 +0000)]
fix sdk build

SVN-Revision: 7855

17 years agomove ncurses to trunk and 7.07 (util-linux depends on it)
Felix Fietkau [Mon, 2 Jul 2007 17:53:19 +0000 (17:53 +0000)]
move ncurses to trunk and 7.07 (util-linux depends on it)

SVN-Revision: 7854

17 years agofix a horrible memleak in madwifi
Felix Fietkau [Mon, 2 Jul 2007 10:59:51 +0000 (10:59 +0000)]
fix a horrible memleak in madwifi

SVN-Revision: 7850

17 years agonuke magicbox-2.6 2.6.21 patches - 2.6.22-rc is stable here
Felix Fietkau [Mon, 2 Jul 2007 06:53:30 +0000 (06:53 +0000)]
nuke magicbox-2.6 2.6.21 patches - 2.6.22-rc is stable here

SVN-Revision: 7848

17 years agoupdate imq patches (fixes #2009)
Felix Fietkau [Mon, 2 Jul 2007 06:31:27 +0000 (06:31 +0000)]
update imq patches (fixes #2009)

SVN-Revision: 7847

17 years agoupgrade layer7 to the latest version and add fixes for 2.6.21 and 2.6.22-rc - compile...
Felix Fietkau [Mon, 2 Jul 2007 02:10:01 +0000 (02:10 +0000)]
upgrade layer7 to the latest version and add fixes for 2.6.21 and 2.6.22-rc - compile tested on .21, run time tested on .22-rc6

SVN-Revision: 7846

17 years agoMove SSB out of brcm47xx target into generic-2.6 target
Peter Denison [Sun, 1 Jul 2007 22:44:05 +0000 (22:44 +0000)]
Move SSB out of brcm47xx target into generic-2.6 target

SVN-Revision: 7844

17 years agoadd gateway 7001 support patch from #1918
Felix Fietkau [Sun, 1 Jul 2007 19:02:23 +0000 (19:02 +0000)]
add gateway 7001 support patch from #1918

SVN-Revision: 7838

17 years agobump busybox release number
Felix Fietkau [Sun, 1 Jul 2007 18:43:55 +0000 (18:43 +0000)]
bump busybox release number

SVN-Revision: 7837

17 years agonuke broadcom 2.6.21 patches - 2.6.22-rc6 is more stable and more up to date
Felix Fietkau [Sun, 1 Jul 2007 18:37:12 +0000 (18:37 +0000)]
nuke broadcom 2.6.21 patches - 2.6.22-rc6 is more stable and more up to date

SVN-Revision: 7836

17 years agoUse -Os for rdc and -O2 for the x86 target
Florian Fainelli [Sun, 1 Jul 2007 17:53:28 +0000 (17:53 +0000)]
Use -Os for rdc and -O2 for the x86 target

SVN-Revision: 7831

17 years agoUpdate bcm43xx-mac80211 to latest git pull, mostly debugging improvements
Peter Denison [Sun, 1 Jul 2007 17:45:47 +0000 (17:45 +0000)]
Update bcm43xx-mac80211 to latest git pull, mostly debugging improvements

SVN-Revision: 7830

17 years agoPackage cfdisk and bump release number (#1992)
Florian Fainelli [Sun, 1 Jul 2007 17:43:31 +0000 (17:43 +0000)]
Package cfdisk and bump release number (#1992)

SVN-Revision: 7828

17 years agoMake bcm43xx-mac802xx bcm47xx-2.6 specific
Florian Fainelli [Sun, 1 Jul 2007 14:05:36 +0000 (14:05 +0000)]
Make bcm43xx-mac802xx bcm47xx-2.6 specific

SVN-Revision: 7825

17 years agoreordered GENERIC_PATCH_DIR variable
Gabor Juhos [Sun, 1 Jul 2007 11:44:50 +0000 (11:44 +0000)]
reordered GENERIC_PATCH_DIR variable

SVN-Revision: 7824

17 years agopatch-cmdline is now gone
Florian Fainelli [Sun, 1 Jul 2007 09:47:26 +0000 (09:47 +0000)]
patch-cmdline is now gone

SVN-Revision: 7821

17 years agoRemove patch-cmdline from the packages and move it tools tools/. adm5120 and rb532...
Florian Fainelli [Sun, 1 Jul 2007 09:45:27 +0000 (09:45 +0000)]
Remove patch-cmdline from the packages and move it tools tools/. adm5120 and rb532 do use it for procuding ready-to-use kernels (#1631)

SVN-Revision: 7820

17 years agorewrite of memory detection code, should be fix #1909
Gabor Juhos [Sun, 1 Jul 2007 09:30:21 +0000 (09:30 +0000)]
rewrite of memory detection code, should be fix #1909

SVN-Revision: 7819